💫 exposed redirectPatternToPath method (for testing) #7

8eecf0d2 · Oct 20, 2018 · 43c6ae6 · 43c6ae6
1 parent b3ac85c
commit 43c6ae6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/ts/server.ts b/src/ts/server.ts
@@ -106,15 +106,15 @@ export class Server {
     const placeholderOptions = Server.placeholderOptions(redirect);
     this.express.all(redirect.from, Server.redirectHeadersMiddleware(redirect), Server.placeholderParamsMiddleware(), (request, response, next) => {
 
-      return response.status(redirect.status).redirect(placeholderOptions.pattern.stringify(request.params));
+      return response.status(redirect.status).redirect(Server.redirectPatternToPath(placeholderOptions.pattern, request.params));
     })
   }
 
   private handleRewrite (redirect: Netlify.Redirect): void {
     const placeholderOptions = Server.placeholderOptions(redirect);
     this.express.all(redirect.from, Server.redirectHeadersMiddleware(redirect), Server.placeholderParamsMiddleware(), (request, response, next) => {
 
-      return response.status(redirect.status).sendFile(path.join(this.paths.static, placeholderOptions.pattern.stringify(request.params)));
+      return response.status(redirect.status).sendFile(path.join(this.paths.static, Server.redirectPatternToPath(placeholderOptions.pattern, request.params)));
     });
   }
 
@@ -124,7 +124,7 @@ export class Server {
     this.express.all(redirect.from, Server.redirectHeadersMiddleware(redirect), Server.placeholderParamsMiddleware(), (request, response, next) => {
 
       return expressHttpProxy(placeholderOptions.url.origin, {
-        proxyReqPathResolver: (proxyRequest: express.Request) =>  placeholderOptions.pattern.stringify(request.params),
+        proxyReqPathResolver: (proxyRequest: express.Request) => Server.redirectPatternToPath(placeholderOptions.pattern, request.params),
       })(request, response, next);
     });
   }
@@ -168,6 +168,9 @@ export class Server {
     }
   }
 
+  private static redirectPatternToPath (pattern: UrlPattern, params: { [key: string]: string }): string {
+    return pattern.stringify(params);
+  }
 
   /**
     Lambda Router