admin page workflow

packages/web/src/utility/api.ts

@@ -12,7 +12,7 @@ import uuidv1 from 'uuid/v1';
 import { openWebLink } from './exportFileTools';
 import { callServerPing } from './connectionsPinger';
 import { batchDispatchCacheTriggers, dispatchCacheChange } from './cache';
-import { isAdminPage } from './pageDefs';
+import { isAdminPage, isOneOfPage } from './pageDefs';
 
 export const strmid = uuidv1();
 
@@ -282,7 +282,7 @@ export function getAuthCategory(config) {
   if (config.isBasicAuth) {
     return 'basic';
   }
-  if (isAdminPage() && config.isAdminLoginForm) {
+  if (isOneOfPage('admin', 'admin-license') && config.isAdminLoginForm) {
     return 'admin';
   }
   if (getElectron()) {

packages/web/src/utility/hasPermission.ts

@@ -20,5 +20,5 @@ export function subscribePermissionCompiler() {
 }
 
 export function setConfigForPermissions(config) {
-  compiled = compilePermissions(config?.permissions || {});
+  compiled = compilePermissions(config?.permissions || []);
 }

packages/web/src/utility/pageDefs.ts

@@ -2,6 +2,10 @@ export function isAdminPage() {
   return window['dbgate_page'] == 'admin';
 }
 
+export function isOneOfPage(...pages) {
+  return pages.includes(window['dbgate_page']);
+}
+
 export function getOpenedTabsStorageName() {
   return isAdminPage() ? 'adminOpenedTabs' : 'openedTabs';
 }

packages/web/src/utility/resolveApi.ts

@@ -1,5 +1,5 @@
 import getElectron from './getElectron';
-import { isAdminPage } from './pageDefs';
+import { isAdminPage, isOneOfPage } from './pageDefs';
 
 let apiUrl = null;
 try {
@@ -17,7 +17,7 @@ export function resolveApiHeaders() {
   const electron = getElectron();
 
   const res = {};
-  const accessToken = localStorage.getItem(isAdminPage() ? 'adminAccessToken' : 'accessToken');
+  const accessToken = localStorage.getItem(isOneOfPage('admin', 'admin-license') ? 'adminAccessToken' : 'accessToken');
   if (accessToken) {
     res['Authorization'] = `Bearer ${accessToken}`;
   }