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

fixes

Browse Source
This commit is contained in:
Jan Prochazka
2024-07-31 09:16:46 +02:00
parent 33cd3b0647
commit faf6339b41
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/tools/src/testPermission.ts
View File

@@ -101,7 +101,7 @@ export function testSubPermission(
export function getPredefinedPermissions(predefinedRoleName: string) { export function getPredefinedPermissions(predefinedRoleName: string) {
switch (predefinedRoleName) { switch (predefinedRoleName) {
case 'superadmin': case 'superadmin':
return ['*', '~widgets/*', 'widgets/admin', '~all-connections']; return ['*', '~widgets/*', 'widgets/admin', 'widgets/database', '~all-connections'];
case 'logged-user': case 'logged-user':
return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections']; return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections'];
case 'anonymous-user': case 'anonymous-user':

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

@@ -117,6 +117,9 @@ export async function doLogout() {
} 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 if (config.isAdminLoginForm && isAdminPage()) {
localStorage.removeItem('adminAccessToken');
internalRedirectTo('?page=admin-login&is-admin=true');
} else { } else {
window.location.href = 'config/logout'; window.location.href = 'config/logout';
} }

5
packages/web/src/stores.ts
View File

@@ -73,7 +73,10 @@ function subscribeCssVariable(store, transform, cssVariable) {
store.subscribe(value => document.documentElement.style.setProperty(cssVariable, transform(value))); store.subscribe(value => document.documentElement.style.setProperty(cssVariable, transform(value)));
} }
export const selectedWidget = writableWithStorage('database', isAdminPage() ? 'selectedAdminWidget' : 'selectedWidget'); export const selectedWidget = writableWithStorage(
isAdminPage() ? 'admin' : 'database',
isAdminPage() ? 'selectedAdminWidget' : 'selectedWidget'
);
export const lockedDatabaseMode = writableWithStorage<boolean>(false, 'lockedDatabaseMode'); export const lockedDatabaseMode = writableWithStorage<boolean>(false, 'lockedDatabaseMode');
export const visibleWidgetSideBar = writableWithStorage(true, 'visibleWidgetSideBar'); export const visibleWidgetSideBar = writableWithStorage(true, 'visibleWidgetSideBar');
export const visibleSelectedWidget = derived( export const visibleSelectedWidget = derived(