ultimate-jekyll-manager 1.9.26 → 1.9.28

package/dist/assets/js/pages/token/index.js

@@ -8,6 +8,14 @@ export default function () {
   const $status = document.getElementById('token-status');
   const $error = document.getElementById('token-error');
   const $errorMessage = document.getElementById('token-error-message');
+  const $spinner = document.getElementById('token-spinner');
+  const $actions = document.getElementById('token-actions');
+  const $retry = document.getElementById('token-retry');
+
+  // Retry re-runs the whole flow — reloading re-attempts auth + token generation
+  if ($retry) {
+    $retry.addEventListener('click', () => window.location.reload());
+  }
 
   // Get URL params
   const url = new URL(window.location.href);
@@ -83,7 +91,7 @@ export default function () {
           const returnUrl = new URL(authReturnUrl);
           returnUrl.searchParams.set('authToken', token);
 
-          // LEGACY: Reformat token for desktop app deep links
+          // LEGACY: Add the legacy payload shape for old desktop app deep links
           // TODO: Remove this block when legacy desktop app support is no longer needed
           _legacyTranslateTokenRedirect(returnUrl, token);
 
@@ -101,6 +109,7 @@ export default function () {
           // Extension background will detect this and close the tab
           url.searchParams.set('authToken', token);
           window.history.replaceState({}, '', url.toString());
+          stopSpinner();
           updateStatus('You can close this tab now.');
         }
       } catch (error) {
@@ -150,8 +159,10 @@ export default function () {
     $status.appendChild($p);
   }
 
-  // Show error message
+  // Show error message + swap the spinner for the retry / go-home actions
   function showError(message) {
+    stopSpinner();
+
     if ($error && $errorMessage) {
       $errorMessage.textContent = message;
       $error.classList.remove('d-none');
@@ -159,14 +170,25 @@ export default function () {
     if ($status) {
       $status.classList.add('d-none');
     }
+    if ($actions) {
+      $actions.classList.remove('d-none');
+    }
+  }
+
+  // Stop the loading spinner once the flow reaches a terminal state
+  function stopSpinner() {
+    if ($spinner) {
+      $spinner.classList.add('d-none');
+    }
   }
 
-  // LEGACY: Reformat token for desktop app deep links
-  // Legacy desktop apps expect ?payload={"token":"X"} instead of ?authToken=X for custom protocol URLs
+  // LEGACY: Add the legacy token shape for desktop app deep links
+  // Legacy desktop apps read ?payload={"token":"X"} on custom protocol URLs — ADDED
+  // alongside ?authToken=X (never replacing it): old apps read payload and ignore
+  // authToken, modern apps (Electron Manager) read authToken and ignore payload.
   // TODO: Remove this function AND its call above when legacy desktop app support is no longer needed
   function _legacyTranslateTokenRedirect(returnUrl, token) {
     if (returnUrl.protocol !== 'http:' && returnUrl.protocol !== 'https:') {
-      returnUrl.searchParams.delete('authToken');
       returnUrl.searchParams.set('payload', JSON.stringify({ token: token }));
     }
   }

package/dist/defaults/dist/_layouts/themes/classy/frontend/pages/auth/token.html

@@ -20,7 +20,7 @@ layout: themes/[ site.theme.id ]/frontend/core/cover
       </div>
 
       <!-- Spinner -->
-      <div class="text-center mb-4">
+      <div id="token-spinner" class="text-center mb-4">
         <div class="spinner-border text-primary" role="status">
           <span class="visually-hidden">Loading...</span>
         </div>
@@ -35,6 +35,12 @@ layout: themes/[ site.theme.id ]/frontend/core/cover
       <div id="token-error" class="alert alert-danger d-none" role="alert">
         <strong>Error:</strong> <span id="token-error-message"></span>
       </div>
+
+      <!-- Actions (hidden until the flow resolves with an error) -->
+      <div id="token-actions" class="text-center d-none">
+        <button type="button" id="token-retry" class="btn btn-primary w-100">Try again</button>
+        <a href="/" class="btn btn-link btn-sm text-muted d-block mt-2">Go home</a>
+      </div>
     </div>
   </div>
 </section>

package/dist/gulp/tasks/serve.js

@@ -129,30 +129,32 @@ async function getHttpsConfig() {
   // Check if mkcert certificates exist
   const certPath = path.join(rootPathProject, '.temp');
 
-  // Look for any mkcert generated files (handles localhost+2.pem format)
-  const certFiles = jetpack.find(certPath, { matching: 'localhost*.pem' }) || [];
+  // Look for any mkcert generated files. NOTE: mkcert names files after the FIRST
+  // SAN host (development.<brand>+N.pem, not localhost*.pem) — match *.pem, the
+  // same pattern generateMkcertCertificates() finds after generating.
+  const certFiles = jetpack.find(certPath, { matching: '*.pem' }) || [];
   const keyFile = certFiles.find(f => f.includes('-key.pem'));
   const certFile = certFiles.find(f => !f.includes('-key.pem'));
 
   if (keyFile && certFile) {
-    logger.log('Using mkcert certificates from .temp/');
-    logger.log(`Certificate: ${certFile}`);
-    logger.log(`Key: ${keyFile}`);
+    const problem = checkCertProblem(certFile);
 
-    // Read certificate to check validity
-    try {
-      const certContent = jetpack.read(certFile);
-      if (certContent && certContent.includes('BEGIN CERTIFICATE')) {
-        logger.log('✅ Certificate appears valid');
-      }
-    } catch (e) {
-      logger.log('⚠️ Could not read certificate');
+    if (!problem) {
+      logger.log('Using mkcert certificates from .temp/');
+      logger.log(`Certificate: ${certFile}`);
+      logger.log(`Key: ${keyFile}`);
+
+      return {
+        key: keyFile,
+        cert: certFile
+      };
     }
 
-    return {
-      key: keyFile,
-      cert: certFile
-    };
+    // Stale certs (expired, or issued by a DIFFERENT machine's mkcert CA — e.g.
+    // .temp copied over from another Mac) make browsers reject https://localhost:4000
+    // outright. Wipe and regenerate against THIS machine's trusted CA.
+    logger.log(`Existing certificates are not usable (${problem}) — regenerating...`);
+    certFiles.forEach((file) => jetpack.remove(file));
   }
 
   // Try to generate mkcert certificates
@@ -170,6 +172,41 @@ async function getHttpsConfig() {
   return true;
 }
 
+// Returns a reason string when the existing cert must be regenerated, or null
+// when it's usable: unexpired AND signed by this machine's trusted mkcert root CA.
+function checkCertProblem(certFile) {
+  const { X509Certificate } = require('crypto');
+  const { execSync } = require('child_process');
+
+  let cert;
+  try {
+    cert = new X509Certificate(jetpack.read(certFile));
+  } catch (e) {
+    return 'unreadable certificate';
+  }
+
+  if (new Date(cert.validTo) <= new Date()) {
+    return `expired ${cert.validTo}`;
+  }
+
+  // Verify the signature chains to the CURRENT mkcert root CA. If mkcert (or its
+  // root) isn't available we can't verify — keep the existing certs rather than
+  // breaking the self-signed fallback path.
+  try {
+    const caRoot = execSync('mkcert -CAROOT', { encoding: 'utf8' }).trim();
+    const ca = new X509Certificate(jetpack.read(path.join(caRoot, 'rootCA.pem')));
+
+    if (!cert.verify(ca.publicKey)) {
+      const issuerCN = cert.issuer.split('\n').find((line) => line.startsWith('CN=')) || cert.issuer;
+      return `issued by a different CA (${issuerCN})`;
+    }
+  } catch (e) {
+    return null;
+  }
+
+  return null;
+}
+
 // Generate mkcert certificates
 async function generateMkcertCertificates(certPath) {
   try {

package/dist/test/suites/page/token-error-state.test.js

@@ -0,0 +1,124 @@
+// /token page: when the flow resolves with an error (e.g. token fetch fails) the
+// loading spinner must STOP and be replaced by a "Try again" (reload) button plus
+// a smaller "Go home" link — previously the spinner spun forever behind the error.
+//
+// Each run() is serialized to the browser (Puppeteer), so every test builds the
+// token card DOM (mirrors classy's auth/token.html) and replicates the module's
+// stopSpinner/showError logic inline — the page module can't be imported (ESM +
+// web-manager deps) and module-scope helpers aren't in the browser's scope.
+
+module.exports = {
+  layer: 'page',
+  description: '/token error state swaps the spinner for retry/home actions',
+  type: 'group',
+  tests: [
+    {
+      name: 'showError stops the spinner and reveals the retry/home actions',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = ''
+          + '<div id="token-spinner" class="text-center mb-4"><div class="spinner-border" role="status"></div></div>'
+          + '<div id="token-status" class="text-center"><p class="text-muted small">Generating secure token...</p></div>'
+          + '<div id="token-error" class="alert alert-danger d-none" role="alert"><strong>Error:</strong> <span id="token-error-message"></span></div>'
+          + '<div id="token-actions" class="text-center d-none">'
+          +   '<button type="button" id="token-retry" class="btn btn-primary w-100">Try again</button>'
+          +   '<a href="/" class="btn btn-link btn-sm text-muted d-block mt-2">Go home</a>'
+          + '</div>';
+        document.body.appendChild($root);
+
+        const $status = $root.querySelector('#token-status');
+        const $error = $root.querySelector('#token-error');
+        const $errorMessage = $root.querySelector('#token-error-message');
+        const $spinner = $root.querySelector('#token-spinner');
+        const $actions = $root.querySelector('#token-actions');
+
+        function stopSpinner() {
+          if ($spinner) { $spinner.classList.add('d-none'); }
+        }
+        function showError(message) {
+          stopSpinner();
+          if ($error && $errorMessage) {
+            $errorMessage.textContent = message;
+            $error.classList.remove('d-none');
+          }
+          if ($status) { $status.classList.add('d-none'); }
+          if ($actions) { $actions.classList.remove('d-none'); }
+        }
+
+        // Baseline: spinner visible, actions + error hidden
+        ctx.expect($spinner.classList.contains('d-none')).toBe(false);
+        ctx.expect($actions.classList.contains('d-none')).toBe(true);
+        ctx.expect($error.classList.contains('d-none')).toBe(true);
+
+        showError('Failed to generate token. Please try again.');
+
+        // Spinner + status gone, error + actions shown, message set
+        ctx.expect($spinner.classList.contains('d-none')).toBe(true);
+        ctx.expect($status.classList.contains('d-none')).toBe(true);
+        ctx.expect($error.classList.contains('d-none')).toBe(false);
+        ctx.expect($actions.classList.contains('d-none')).toBe(false);
+        ctx.expect($errorMessage.textContent).toBe('Failed to generate token. Please try again.');
+
+        $root.remove();
+      },
+    },
+    {
+      name: 'retry button click re-runs the flow (reload)',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = '<button type="button" id="token-retry" class="btn btn-primary w-100">Try again</button>';
+        document.body.appendChild($root);
+
+        const $retry = $root.querySelector('#token-retry');
+
+        // Mirror the module's wiring with reload stubbed (can't reload the harness)
+        let reloadCount = 0;
+        $retry.addEventListener('click', () => { reloadCount++; });
+
+        $retry.click();
+        $retry.click();
+
+        ctx.expect(reloadCount).toBe(2);
+
+        $root.remove();
+      },
+    },
+    {
+      name: 'go-home link points at the site root',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = '<div id="token-actions"><a href="/" class="btn btn-link btn-sm text-muted d-block mt-2">Go home</a></div>';
+        document.body.appendChild($root);
+
+        const $home = $root.querySelector('#token-actions a');
+
+        ctx.expect($home).toBeTruthy();
+        ctx.expect($home.getAttribute('href')).toBe('/');
+
+        $root.remove();
+      },
+    },
+    {
+      name: 'terminal success (close-tab flow) also stops the spinner',
+      run: async (ctx) => {
+        const $root = document.createElement('div');
+        $root.innerHTML = ''
+          + '<div id="token-spinner" class="text-center mb-4"><div class="spinner-border" role="status"></div></div>'
+          + '<div id="token-actions" class="text-center d-none"></div>';
+        document.body.appendChild($root);
+
+        const $spinner = $root.querySelector('#token-spinner');
+        const $actions = $root.querySelector('#token-actions');
+
+        // The extension "You can close this tab now." branch calls stopSpinner()
+        if ($spinner) { $spinner.classList.add('d-none'); }
+
+        ctx.expect($spinner.classList.contains('d-none')).toBe(true);
+        // No error, so the retry/home actions stay hidden
+        ctx.expect($actions.classList.contains('d-none')).toBe(true);
+
+        $root.remove();
+      },
+    },
+  ],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "1.9.26",
+  "version": "1.9.28",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "files": [
@@ -116,7 +116,7 @@
     "prettier": "^3.9.4",
     "sass": "^1.101.0",
     "spellchecker": "^3.7.1",
-    "web-manager": "^4.3.2",
+    "web-manager": "^4.3.4",
     "webpack": "^5.108.3",
     "wonderful-fetch": "^2.0.5",
     "wonderful-version": "^1.3.2",