Merge pull request #1459 from ithaka/fix/routing-checks

Update routing check to catch more cases
ithaka · Jul 10, 2024 · 6112adf · 6112adf
2 parents 2a531e2 + ceafade
commit 6112adf
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -112,26 +112,22 @@ fetch('/unfederated-session-service/query', {
 
         const currentRequest = window.location.href;
 
-        if (currentRequest.includes('/#/')) {
-          const params = new URLSearchParams({ artstorPath: currentRequest }).toString();
+        const params = new URLSearchParams({ artstorPath: currentRequest }).toString();
 
-          fetch(`/get-the-redirect-please/?${params}`)
-            .then(redirectResponse => redirectResponse.json())
-            .then(redirectData => {
-              if (redirectData.location) {
-                if (doRedirect) {
-                  console.log('Redirecting to:', redirectData.location);
-                  window.location.replace(redirectData.location);
-                } else {
-                  console.log('Will eventually redirect to:', redirectData.location);
-                  initializeApp();
-                }
+        fetch(`/get-the-redirect-please/?${params}`)
+          .then(redirectResponse => redirectResponse.json())
+          .then(redirectData => {
+            if (redirectData.location) {
+              if (doRedirect) {
+                console.log('Redirecting to:', redirectData.location);
+                window.location.replace(redirectData.location);
               } else {
+                console.log('Will eventually redirect to:', redirectData.location);
                 initializeApp();
               }
-            });
-        } else {
-          initializeApp();
-        }
+            } else {
+              initializeApp();
+            }
+          });
       });
   });