@yuuvis/client-core 2.20.0 → 2.20.1

package/fesm2022/yuuvis-client-core.mjs

@@ -3119,16 +3119,20 @@ class AuthService {
      */
     setInitialRequestUri() {
         const ignore = ['/', '/index.html'];
-        let uri = `${location.pathname}${location.search}`.replace(Utils.getBaseHref(), '');
-        uri = !uri.startsWith('/') ? `/${uri}` : uri;
-        if (!ignore.includes(uri)) {
-            this.#appCache
-                .setItem(this.#INITIAL_REQUEST_STORAGE_KEY, {
+        const baseHref = Utils.getBaseHref();
+        // Check only the pathname against the ignore list so that auth callback
+        // query params (e.g. ?session_state=…) don't bypass the check.
+        let path = location.pathname.replace(baseHref, '');
+        path = !path.startsWith('/') ? `/${path}` : path;
+        if (!ignore.includes(path)) {
+            let uri = `${location.pathname}${location.search}`.replace(baseHref, '');
+            uri = !uri.startsWith('/') ? `/${uri}` : uri;
+            return this.#appCache.setItem(this.#INITIAL_REQUEST_STORAGE_KEY, {
                 uri: uri,
                 timestamp: Date.now()
-            })
-                .subscribe();
+            });
         }
+        return of(false);
     }
     /**
      * Get the URL that entered the app. May be a deep link that could then be
@@ -3435,8 +3439,7 @@ const init_moduleFnc = () => {
     const http = inject(HttpClient);
     const configService = inject(ConfigService);
     const authService = inject(AuthService);
-    authService.setInitialRequestUri();
-    return coreConfig.main
+    return authService.setInitialRequestUri().pipe(switchMap(() => coreConfig.main
         ? !Array.isArray(coreConfig.main)
             ? of([coreConfig.main])
             : forkJoin([...coreConfig.main].map((uri) => http.get(`${Utils.getBaseHref()}${uri}`).pipe(catchError((e) => {
@@ -3451,7 +3454,7 @@ const init_moduleFnc = () => {
                 };
                 return of(true);
             }))))
-        : of(false);
+        : of(false)));
 };
 
 var DeviceScreenOrientation;