Merge pull request #98 from felipesabino/bugfix/prefix-with-regex-routes

Fix routePrefix handling for routes using regex

Author: pleerock

src/metadata/ActionMetadata.ts

@@ -262,11 +262,15 @@ export class ActionMetadata {
      * Appends base route to a given regexp route.
      */
     static appendBaseRoute(baseRoute: string, route: RegExp|string) {
+        const prefix = `${baseRoute.length > 0 && baseRoute.indexOf("/") < 0 ? "/" : ""}${baseRoute}`;
+
         if (typeof route === "string")
-            return `${baseRoute}${route}`;
+            return `${prefix}${route}`;
 
         if (!baseRoute || baseRoute === "") return route;
-        const fullPath = baseRoute.replace("\/", "\\\\/") + route.toString().substr(1);
+
+        const fullPath = `^${prefix}${route.toString().substr(1)}?$`;
+        
         return new RegExp(fullPath, route.flags);
     }
 

test/functional/global-options.spec.ts

@@ -37,6 +37,12 @@ describe("routing-controllers global options", () => {
                 return "";
             }
 
+            @Post(new RegExp("/(prefix|regex)/users"))
+            postUsersWithRegex(@Body() user: User) {
+                initializedUser = user;
+                return "";
+            }
+            
         }
     });
 
@@ -84,13 +90,20 @@ describe("routing-controllers global options", () => {
 
     describe("when routePrefix is used all controller routes should be appended by it", () => {
 
-        let expressApp: any, koaApp: any;
-        before(done => expressApp = createExpressServer({ routePrefix: "/api" }).listen(3001, done));
-        after(done => expressApp.close(done));
-        before(done => koaApp = createKoaServer({ routePrefix: "/api" }).listen(3002, done));
-        after(done => koaApp.close(done));
+        let apps: any[] = [];
+        before(done => apps.push(createExpressServer({ routePrefix: "/api" }).listen(3001, done)));
+        before(done => apps.push(createExpressServer({ routePrefix: "api" }).listen(3002, done)));
+        before(done => apps.push(createKoaServer({ routePrefix: "/api" }).listen(3003, done)));
+        before(done => apps.push(createKoaServer({ routePrefix: "api" }).listen(3004, done)));
+        after(done => { apps.forEach(app => app.close()); done(); });
 
-        assertRequest([3001, 3002], "post", "api/users", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
+        assertRequest([3001, 3002, 3003, 3004], "post", "api/users", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
+            expect(initializedUser).to.be.instanceOf(User);
+            expect(response).to.have.status(200);
+        });
+
+        assertRequest([3001, 3002, 3003, 3004], "post", "api/regex/users", { firstName: "Umed", lastName: "Khudoiberdiev" }, response => {
+            expect(initializedUser).to.be.instanceOf(User);
             expect(response).to.have.status(200);
         });
     });

test/functional/redirect-decorator.spec.ts

@@ -4,6 +4,7 @@ import {createExpressServer, createKoaServer, getMetadataArgsStorage} from "../.
 import {assertRequest} from "./test-utils";
 import {Redirect} from "../../src/decorator/Redirect";
 import {JsonController} from "../../src/decorator/JsonController";
+import {Param} from "../../src/decorator/Param";
 const chakram = require("chakram");
 const expect = chakram.expect;
 
@@ -14,18 +15,31 @@ describe("dynamic redirect", function () {
         // reset metadata args storage
         getMetadataArgsStorage().reset();
 
+        @JsonController("/users")
+        class TestController {
+
+            @Get("/:id")
+            async getOne(@Param("id") id: string) {
+                return {
+                    login: id
+                };
+            }
+
+
+        }
+
         @JsonController()
         class RedirectController {
 
             @Get("/template")
-            @Redirect("https://api.github.com/users/:owner")
+            @Redirect("/users/:owner")
             template() {
                 // console.log("/template");
                 return {owner: "pleerock", repo: "routing-controllers"};
             }
 
             @Get("/original")
-            @Redirect("https://api.github.com/users/pleerock")
+            @Redirect("/users/pleerock")
             original() {
                 // console.log("/original");
             }
@@ -34,7 +48,7 @@ describe("dynamic redirect", function () {
             @Redirect("https://api.github.com")
             override() {
                 // console.log("/override");
-                return "https://api.github.com/users/pleerock";
+                return "/users/pleerock";
             }
 
         }
@@ -54,36 +68,22 @@ describe("dynamic redirect", function () {
     });
     after(done => koaApp.close(done));
 
-    this.timeout(5000); // 2000ms timeout
-
     describe("using template", () => {
-        assertRequest([3001, 3002], "get", "template", {
-            headers: {
-                "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36"
-            }
-        }, response => {
+        assertRequest([3001, 3002], "get", "template", response => {
             expect(response).to.have.status(200);
             expect(response.body).has.property("login", "pleerock");
         });
     });
 
     describe("using override", () => {
-        assertRequest([3001, 3002], "get", "override", {
-            headers: {
-                "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36"
-            }
-        }, response => {
+        assertRequest([3001, 3002], "get", "override", response => {
             expect(response).to.have.status(200);
             expect(response.body).has.property("login", "pleerock");
         });
     });
 
     describe("using original", () => {
-        assertRequest([3001, 3002], "get", "original", {
-            headers: {
-                "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36"
-            }
-        }, response => {
+        assertRequest([3001, 3002], "get", "original", response => {
             expect(response).to.have.status(200);
             expect(response.body).has.property("login", "pleerock");
         });