Merge pull request #291 from namecheap/respectIndependentRouteAsStar

fix: bug when route as "*" is final one
namecheap · May 5, 2021 · f5facce · f5facce
2 parents f826688 + 324c9ea
commit f5facce
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/ilc/common/router/Router.js b/ilc/common/router/Router.js
@@ -98,7 +98,7 @@ module.exports = class Router {
             let routeExp;
 
             if (v.route === '*') {
-                routeExp = new RegExp(`(.*)`);
+                routeExp = new RegExp(`(\/).*`);
             } else if (v.route === '/') {
                 routeExp = new RegExp(`^(/)$`);
             } else if (v.route.match(/\/\*$/) !== null) {

diff --git a/ilc/common/router/Router.spec.js b/ilc/common/router/Router.spec.js
@@ -170,6 +170,29 @@ describe('router', () => {
             });
         });
 
+        it('should return matched route with correct basePath if exists only route="*" as final point', () => {
+            const independentRouteStar = registryConfig.routes.find(n => n.route === '*');
+
+            const router = new Router({
+                ...registryConfig,
+                routes: [{
+                    ...independentRouteStar,
+                    next: false,
+                }],
+            });
+            const reqUrl = '/hero/apps?prop=value';
+
+            const result = {
+                ...independentRouteStar,
+                reqUrl,
+                specialRole: null,
+                basePath: '/',
+            };
+            delete result.next;
+
+            chai.expect(router.match(reqUrl)).to.be.eql(result);
+        });
+
         it('should return 404 route when a router does not match any route', () => {
             const router = new Router(registryConfig);
             const reqUrl = '/nonexistent?prop=value';