dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-21 15:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

redirect fixes

Browse Source
This commit is contained in:
Jan Prochazka
2024-07-28 08:25:53 +02:00
parent f1920549a8
commit 0afee6e3fe
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/web/src/LoginPage.svelte
View File

@@ -49,7 +49,7 @@
}); });
if (resp.error) { if (resp.error) {
internalRedirectTo( internalRedirectTo(
`/?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}` `?page=not-logged&error=${encodeURIComponent(resp.error)}&is-admin=${isAdminPage ? 'true' : ''}`
); );
return; return;
} }
@@ -57,13 +57,13 @@
if (accessToken) { if (accessToken) {
localStorage.setItem(isAdminPage ? 'adminAccessToken' : 'accessToken', accessToken); localStorage.setItem(isAdminPage ? 'adminAccessToken' : 'accessToken', accessToken);
if (isAdminPage) { if (isAdminPage) {
internalRedirectTo('/?page=admin'); internalRedirectTo('?page=admin');
} else { } else {
internalRedirectTo('/'); internalRedirectTo('?');
} }
return; return;
} }
internalRedirectTo(`/?page=not-logged`); internalRedirectTo(`?page=not-logged`);
}} }}
/> />
</div> </div>

10
packages/web/src/clientAuth.ts
View File

@@ -30,7 +30,7 @@ export function handleOauthCallback() {
internalRedirectTo('/'); internalRedirectTo('/');
} else { } else {
console.log('Error when processing OAUTH callback', error || errorMessage); 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() { export async function redirectToAdminLogin() {
internalRedirectTo('/?page=admin-login'); internalRedirectTo('?page=admin-login');
return; return;
} }
@@ -80,7 +80,7 @@ export async function redirectToLogin(config = null, force = false) {
return; return;
} }
} }
internalRedirectTo('/?page=login'); internalRedirectTo('?page=login');
return; return;
} }
@@ -112,11 +112,11 @@ export async function doLogout() {
if (config.oauthLogout) { if (config.oauthLogout) {
window.location.href = config.oauthLogout; window.location.href = config.oauthLogout;
} else { } else {
internalRedirectTo('/?page=not-logged'); internalRedirectTo('?page=not-logged');
} }
} else if (config.isLoginForm) { } else if (config.isLoginForm) {
localStorage.removeItem(isAdminPage() ? 'adminAccessToken' : 'accessToken'); localStorage.removeItem(isAdminPage() ? 'adminAccessToken' : 'accessToken');
internalRedirectTo(`/?page=not-logged&is-admin=${isAdminPage() ? 'true' : ''}`); internalRedirectTo(`?page=not-logged&is-admin=${isAdminPage() ? 'true' : ''}`);
} else { } else {
window.location.href = 'config/logout'; window.location.href = 'config/logout';
} }