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

special pages workflow changed

Browse Source
This commit is contained in:
Jan Prochazka
2024-10-21 17:36:46 +02:00
parent 967615b6e5
commit 32c7919885
14 changed files with 339 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/web/src/utility/api.ts
View File

@@ -4,7 +4,7 @@ import { writable } from 'svelte/store';
import getElectron from './getElectron';
// import socket from './socket';
import { showSnackbarError } from '../utility/snackbar';
import { isOauthCallback, redirectToAdminLogin, redirectToLogin } from '../clientAuth';
import { handleAuthOnStartup, isOauthCallback, redirectToAdminLogin, redirectToLogin } from '../clientAuth';
import { showModal } from '../modals/modalTools';
import DatabaseLoginModal, { isDatabaseLoginVisible } from '../modals/DatabaseLoginModal.svelte';
import _ from 'lodash';
@@ -144,17 +144,23 @@ export function transformApiArgsInv(args) {
});
}
export async function apiCall(route: string, args: {} = undefined) {
export async function apiCall(
route: string,
args: {} = undefined,
options: { skipDisableChecks: boolean } = undefined
) {
if (apiLogging) {
console.log('>>> API CALL', route, args);
}
if (apiDisabled) {
console.log('API disabled!!', route);
return;
}
if (disabledOnOauth && route != 'auth/oauth-token') {
console.log('API disabled because oauth callback!!', route);
return;
if (!options?.skipDisableChecks) {
if (apiDisabled) {
console.log('API disabled!!', route);
return;
}
if (disabledOnOauth && route != 'auth/oauth-token') {
console.log('API disabled because oauth callback!!', route);
return;
}
}
args = transformApiArgs(args);
@@ -180,12 +186,15 @@ export async function apiCall(route: string, args: {} = undefined) {
disableApi();
console.log('Disabling API', route);
if (page != 'login' && page != 'admin-login' && page != 'not-logged') {
// unauthorized
if (page == 'admin') {
redirectToAdminLogin();
} else {
redirectToLogin();
}
const config = await apiCall('config/get', {}, { skipDisableChecks: true });
await handleAuthOnStartup(config);
// // unauthorized
// if (page == 'admin') {
// redirectToAdminLogin();
// } else {
// redirectToLogin();
// }
}
return;
}