From 0afee6e3fe2edae2ae4c974e2a698106bc670e99 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sun, 28 Jul 2024 08:25:53 +0200
Subject: [PATCH] redirect fixes

---
 packages/web/src/LoginPage.svelte |  8 ++++----
 packages/web/src/clientAuth.ts    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/web/src/LoginPage.svelte b/packages/web/src/LoginPage.svelte
index b115882e0..7f32ceaec 100644
--- a/packages/web/src/LoginPage.svelte
+++ b/packages/web/src/LoginPage.svelte
@@ -49,7 +49,7 @@
               });
               if (resp.error) {
                 internalRedirectTo(
-                  `/?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
+                  `?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
                 );
                 return;
               }
@@ -57,13 +57,13 @@
               if (accessToken) {
                 localStorage.setItem(isAdminPage ? 'adminAccessToken' : 'accessToken', accessToken);
                 if (isAdminPage) {
-                  internalRedirectTo('/?page=admin');
+                  internalRedirectTo('?page=admin');
                 } else {
-                  internalRedirectTo('/');
+                  internalRedirectTo('?');
                 }
                 return;
               }
-              internalRedirectTo(`/?page=not-logged`);
+              internalRedirectTo(`?page=not-logged`);
             }}
           />
         </div>
diff --git a/packages/web/src/clientAuth.ts b/packages/web/src/clientAuth.ts
index db5d71736..8f3c0941e 100644
--- a/packages/web/src/clientAuth.ts
+++ b/packages/web/src/clientAuth.ts
@@ -30,7 +30,7 @@ export function handleOauthCallback() {
         internalRedirectTo('/');
       } else {
         console.log('Error when processing OAUTH callback', error || errorMessage);
-        internalRedirectTo(`/?page=not-logged&error=${error || errorMessage}`);
+        internalRedirectTo(`?page=not-logged&error=${error || errorMessage}`);
       }
     });
 
@@ -63,7 +63,7 @@ export async function handleAuthOnStartup(config, isAdminPage = false) {
 }
 
 export async function redirectToAdminLogin() {
-  internalRedirectTo('/?page=admin-login');
+  internalRedirectTo('?page=admin-login');
   return;
 }
 
@@ -80,7 +80,7 @@ export async function redirectToLogin(config = null, force = false) {
         return;
       }
     }
-    internalRedirectTo('/?page=login');
+    internalRedirectTo('?page=login');
     return;
   }
 
@@ -112,11 +112,11 @@ export async function doLogout() {
     if (config.oauthLogout) {
       window.location.href = config.oauthLogout;
     } else {
-      internalRedirectTo('/?page=not-logged');
+      internalRedirectTo('?page=not-logged');
     }
   } else if (config.isLoginForm) {
     localStorage.removeItem(isAdminPage() ? 'adminAccessToken' : 'accessToken');
-    internalRedirectTo(`/?page=not-logged&is-admin=${isAdminPage() ? 'true' : ''}`);
+    internalRedirectTo(`?page=not-logged&is-admin=${isAdminPage() ? 'true' : ''}`);
   } else {
     window.location.href = 'config/logout';
   }