Fix asterisk name usages

Author: stanlemon

apps/template/app.js

@@ -58,4 +58,4 @@ app.delete(
 );
 
 app.spa();
-app.catch404s("/api/*");
+app.catch404s("/api/");

packages/server-with-auth/app.js

@@ -53,4 +53,4 @@ app.get(
   }))
 );
 
-app.catch404s("/api/*");
+app.catch404s("/api/");

packages/server-with-auth/app.test.js

@@ -5,9 +5,6 @@ import request from "supertest";
 import { app } from "./app.js";
 import { signupAndLogin } from "./src/utilities/testUtils.js";
 
-const username = "test" + Math.random();
-const password = "p@$$w0rd!";
-
 describe("/app", () => {
   it("Insecure endpoint", async () => {
     // Insecure endpoint
@@ -29,6 +26,7 @@ describe("/app", () => {
   });
 
   it("Secure endpoint with auth", async () => {
+    const { username, password } = makeUsernameAndPassword();
     const session = await signupAndLogin(app, username, password, {
       email: "test@test.com",
       fullName: "Test User",
@@ -50,4 +48,27 @@ describe("/app", () => {
       })
     );
   });
+
+  it("404 on undefined api path", async () => {
+    const { username, password } = makeUsernameAndPassword();
+    const session = await signupAndLogin(app, username, password, {
+      email: "test@test.com",
+      fullName: "Test User",
+    });
+
+    const token = session.token;
+
+    const response = await request(app)
+      .get("/api/not-found")
+      .set("Accept", "application/json")
+      .set("Authorization", "Bearer " + token);
+
+    expect(response.status).toEqual(404);
+  });
 });
+
+function makeUsernameAndPassword() {
+  const username = "test" + Math.random();
+  const password = "p@$$w0rd!";
+  return { username, password };
+}

packages/server/app.test.js

@@ -49,4 +49,12 @@ describe("/app", () => {
     expect(response.status).toEqual(200);
     expect(response.body).toEqual({ hello: "Henry" });
   });
+
+  it("GET 404 on undefined api path", async () => {
+    const response = await request(app)
+      .get("/not-found")
+      .set("Accept", "application/json");
+
+    expect(response.status).toEqual(404);
+  });
 });

packages/server/src/createAppServer.js

@@ -75,7 +75,7 @@ export default function createAppServer(options) {
     console.info("Proxying webpack dev server");
 
     app.get(
-      "/static/*",
+      "/static/*splat",
       createProxyMiddleware({
         target: webpack,
         changeOrigin: true,
@@ -120,25 +120,25 @@ export default function createAppServer(options) {
   app.spa = () => {
     if (useWebpack) {
       app.get(
-        "*",
+        "/*splat",
         createProxyMiddleware({
           target: webpack,
           changeOrigin: true,
         })
       );
     } else {
-      app.get(`*`, function (req, res, next) {
+      app.get(`/*splat`, function (req, res, next) {
         res.sendFile(path.resolve("./", "dist", "index.html"));
       });
     }
   };
 
-  app.catch404s = (path = "/*") => {
+  app.catch404s = (path = "/") => {
     const router = Router();
     router.use((req, res, next) => {
       res.status(404).json({ error: "Not Found" });
     });
-    app.use(path, router);
+    app.use(`${path}*splat`, router);
   };
 
   // If we're set to start. Btw we never start in test.