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

forms login

Browse Source
This commit is contained in:
Jan Prochazka
2022-11-26 11:21:37 +01:00
parent 9a5287725b
commit b1ae7d53b9
6 changed files with 84 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import { apiCall, disableApi } from './utility/api';
import { apiCall, disableApi, enableApi } from './utility/api';
import { getConfig } from './utility/metadataLoaders';
export function isOauthCallback() {
@@ -23,7 +23,7 @@ export function handleOauthCallback() {
}).then(authResp => {
const { accessToken } = authResp;
localStorage.setItem('accessToken', accessToken);
location.replace('/');
internalRedirectTo('/');
});
return true;
@@ -42,13 +42,21 @@ export async function handleAuthOnStartup(config) {
}
}
export async function redirectToLogin(config = null) {
if (!config) config = await getConfig();
export async function redirectToLogin(config = null, force = false) {
if (!config) {
enableApi();
config = await getConfig();
}
if (config.isLoginForm) {
const index = location.pathname.lastIndexOf('/');
const loginPath = index >= 0 ? location.pathname.substring(0, index) + '/?page=login' : '/?page=login';
location.replace(loginPath);
if (!force) {
const params = new URLSearchParams(location.search);
if (params.get('page') == 'login' || params.get('page') == 'not-logged') {
return;
}
}
internalRedirectTo('/?page=login');
return;
}
if (config.oauth) {
@@ -60,5 +68,12 @@ export async function redirectToLogin(config = null) {
location.origin + location.pathname
)}&state=${encodeURIComponent(state)}`
);
return;
}
}
export function internalRedirectTo(path) {
const index = location.pathname.lastIndexOf('/');
const newPath = index >= 0 ? location.pathname.substring(0, index) + path : path;
location.replace(newPath);
}