admin page workflow

packages/web/build-index.js

@@ -6,10 +6,11 @@ for (const page of [
   '',
   'not-logged',
   'error',
-  'admin-login',
   'login',
+  'admin-login',
   'admin',
   'license',
+  'admin-license',
   'set-admin-password',
   'redirect',
 ]) {

packages/web/src/EnterLicensePage.svelte

@@ -13,6 +13,7 @@
   import SpecialPageLayout from './widgets/SpecialPageLayout.svelte';
   import hasPermission from './utility/hasPermission';
   import ErrorInfo from './elements/ErrorInfo.svelte';
+  import { isOneOfPage } from './utility/pageDefs';
 
   const config = useConfig();
   const values = writable({ amoid: null, databaseServer: null });
@@ -45,7 +46,7 @@
             const { licenseKey } = e.detail;
             const resp = await apiCall('config/save-license-key', { licenseKey });
             if (resp?.status == 'ok') {
-              internalRedirectTo('/index.html');
+              internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
             } else {
               errorMessage = resp?.errorMessage || 'Error saving license key';
             }
@@ -62,7 +63,7 @@
               const license = await apiCall('config/start-trial');
               if (license?.status == 'ok') {
                 sessionStorage.setItem('continueTrialConfirmed', '1');
-                internalRedirectTo('/index.html');
+                internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
               } else {
                 errorMessage = license?.errorMessage || 'Error starting trial';
               }
@@ -77,7 +78,7 @@
             value={`Continue trial (${trialDaysLeft} days left)`}
             on:click={async e => {
               sessionStorage.setItem('continueTrialConfirmed', '1');
-              internalRedirectTo('/index.html');
+              internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
             }}
           />
         </div>

packages/web/src/clientAuth.ts

@@ -129,7 +129,11 @@ export async function handleAuthOnStartup(config) {
   function checkInvalidLicense() {
     if (!config.isLicenseValid) {
       if (config.storageDatabase || getElectron()) {
+        if (isAdminPage()) {
+          internalRedirectTo(`/admin-license.html`);
+        } else {
           internalRedirectTo(`/license.html`);
+        }
       } else {
         internalRedirectTo(`/error.html`);
       }
@@ -185,7 +189,7 @@ export async function handleAuthOnStartup(config) {
   if (page == 'login' || page == 'admin-login' || page == 'not-logged') return;
   if (checkLoggedUser()) return;
 
-  if (page == 'license') return;
+  if (page == 'license' || page == 'admin-license') return;
   if (checkTrialDaysLeft()) return;
   if (checkInvalidLicense()) return;
 

packages/web/src/main.ts

@@ -34,6 +34,7 @@ function createApp() {
         props: {},
       });
     case 'license':
+    case 'admin-license':
       return new EnterLicensePage({
         target: document.body,
         props: {},

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}`;
   }

packages/web/src/widgets/SpecialPageLayout.svelte

@@ -9,8 +9,8 @@
       const config = await getConfig();
       setConfigForPermissions(config);
       await handleAuthOnStartup(config);
-    } catch (e) {
+    } catch (err) {
-      console.log('Error calling API, trying again in 1s');
+      console.log('Error calling API, trying again in 1s:', err.message);
       setTimeout(loadApi, 1000);
     }
   }