SYNC: renew license from set license page

packages/api/src/controllers/config.js

@@ -209,7 +209,7 @@ module.exports = {
   },
 
   saveLicenseKey_meta: true,
-  async saveLicenseKey({ licenseKey, forceSave = false }) {
+  async saveLicenseKey({ licenseKey, forceSave = false, tryToRenew = false }) {
     if (!forceSave) {
       const decoded = jwt.decode(licenseKey?.trim());
       if (!decoded) {
@@ -221,10 +221,21 @@ module.exports = {
 
       const { exp } = decoded;
       if (exp * 1000 < Date.now()) {
-        return {
-          status: 'error',
-          errorMessage: 'License key is expired',
-        };
+        let renewed = false;
+        if (tryToRenew) {
+          const newLicenseKey = await tryToGetRefreshedLicense(licenseKey);
+          if (newLicenseKey.status == 'ok') {
+            licenseKey = newLicenseKey.token;
+            renewed = true;
+          }
+        }
+
+        if (!renewed) {
+          return {
+            status: 'error',
+            errorMessage: 'License key is expired',
+          };
+        }
       }
     }
 

packages/web/src/EnterLicensePage.svelte

@@ -50,7 +50,7 @@
           on:click={async e => {
             sessionStorage.setItem('continueTrialConfirmed', '1');
             const { licenseKey } = e.detail;
-            const resp = await apiCall('config/save-license-key', { licenseKey });
+            const resp = await apiCall('config/save-license-key', { licenseKey, tryToRenew: true });
             if (resp?.status == 'ok') {
               internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
             } else {

packages/web/src/widgets/SpecialPageLayout.svelte

@@ -84,7 +84,7 @@
   }
 
   .wrap {
-    margin-top: 20vh;
+    margin-top: 5vh;
   }
 
   .heading {