diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js index 477a6e651..ed1b34b1f 100644 --- a/packages/api/src/controllers/config.js +++ b/packages/api/src/controllers/config.js @@ -62,6 +62,8 @@ module.exports = { const logoutUrl = storageConnectionError ? null : await authProvider.getLogoutUrl(); const adminConfig = storageConnectionError ? null : await storage.readConfig({ group: 'admin' }); + storage.startRefreshLicense(); + const isAdminPasswordMissing = !!( process.env.STORAGE_DATABASE && !process.env.ADMIN_PASSWORD && @@ -81,7 +83,7 @@ module.exports = { isElectron: platformInfo.isElectron, isLicenseValid, isLicenseExpired: checkedLicense?.isExpired, - trialDaysLeft: checkedLicense?.isGeneratedTrial && !checkedLicense?.isExpired ? checkedLicense?.daysLeft : null, + trialDaysLeft: checkedLicense?.licenseTypeObj?.isTrial && !checkedLicense?.isExpired ? checkedLicense?.daysLeft : null, checkedLicense, configurationError, logoutUrl, diff --git a/packages/api/src/controllers/storage.js b/packages/api/src/controllers/storage.js index 58e21dc8d..92f28e0c4 100644 --- a/packages/api/src/controllers/storage.js +++ b/packages/api/src/controllers/storage.js @@ -26,4 +26,6 @@ module.exports = { async readConfig({ group }) { return {}; }, + + startRefreshLicense() {}, }; diff --git a/packages/web/src/EnterLicensePage.svelte b/packages/web/src/EnterLicensePage.svelte index 5a689bcc5..ada4bd723 100644 --- a/packages/web/src/EnterLicensePage.svelte +++ b/packages/web/src/EnterLicensePage.svelte @@ -30,6 +30,12 @@ } // $: console.log('CONFIG', $config); + + $: { + if ($config?.isLicenseValid) { + internalRedirectTo('/'); + } + } @@ -88,9 +94,18 @@ { + // openWebLink( + // `https://auth.dbgate.eu/create-checkout-session-simple?source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}` + // ); + + // openWebLink( + // `https://auth-proxy.dbgate.udolni.net/redirect-to-purchase?product=${getElectron() ? 'premium' : 'teram-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}` + // ); + openWebLink( - `https://auth.dbgate.eu/create-checkout-session-simple?source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}` + `https://auth.dbgate.eu/redirect-to-purchase?product=${getElectron() ? 'premium' : 'teram-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}` ); + }} />