Refactored a bit

Author: FabianGosebrink

projects/angular-auth-oidc-client/src/lib/interceptor/closest-matching-route.service.ts

@@ -11,13 +11,15 @@ export class ClosestMatchingRouteService {
     for (const config of configurations) {
       const { secureRoutes } = config;
 
-      for (const configuredRoute of secureRoutes ?? []) {
-        if (route.startsWith(configuredRoute) || wildcardToRegExp(configuredRoute).test(route)) {
-          return {
-            matchingRoute: configuredRoute,
-            matchingConfig: config,
-          };
-        }
+      const matchingRoute = (secureRoutes ?? []).find((secureRoute) =>
+        this.routeMatches(secureRoute, route)
+      );
+
+      if (matchingRoute) {
+        return {
+          matchingRoute,
+          matchingConfig: config,
+        };
       }
     }
 
@@ -26,6 +28,19 @@ export class ClosestMatchingRouteService {
       matchingConfig: null,
     };
   }
+
+  private routeMatches(configuredRoute: string, route: string): boolean {
+    return (
+      route.startsWith(configuredRoute) ||
+      this.matchesRoute(configuredRoute, route)
+    );
+  }
+
+  private matchesRoute(configuredRoute: string, route: string): boolean {
+    const regex = wildcardToRegExp(configuredRoute);
+
+    return regex.test(route);
+  }
 }
 
 export interface ClosestMatchingRouteResult {

projects/angular-auth-oidc-client/src/lib/utils/regex/regex.helper.spec.ts

@@ -8,21 +8,25 @@ describe('RegexHelper', () => {
           'https://third-route.com/test2'
         )
       ).toBeFalsy();
+
       expect(
         wildcardToRegExp('https://third-route.com/*/test').test(
           'https://third-route.com/test'
         )
       ).toBeFalsy();
+
       expect(
         wildcardToRegExp('https://third-route.com/*/test').test(
           'https://third-route.com/foo/test'
         )
       ).toBeTruthy();
+
       expect(
         wildcardToRegExp('https://third-route.com/*/test').test(
           'https://third-route.com/foo/test/bar'
         )
       ).toBeFalsy();
+
       expect(
         wildcardToRegExp('https://third-route.com/*/test/*').test(
           'https://third-route.com/foo/test/bar'

projects/angular-auth-oidc-client/src/lib/utils/regex/regex.helper.ts

@@ -2,13 +2,15 @@
  * Creates a RegExp from the given string, converting asterisks to .* expressions,
  * and escaping all other characters.
  */
-export function wildcardToRegExp(s: string): RegExp {
-  return new RegExp('^' + s.split(/\*+/).map(regExpEscape).join('.*') + '$');
+export function wildcardToRegExp(value: string): RegExp {
+  const regexPattern = regExpEscape(value);
+
+  return new RegExp(`^${regexPattern}$`);
 }
 
 /**
  * RegExp-escapes all characters in the given string.
  */
-function regExpEscape(s: string): string {
-  return s.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&');
+function regExpEscape(value: string): string {
+  return value.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
 }