ultimate-jekyll-manager 1.1.7 → 1.1.9

package/CHANGELOG.md

@@ -14,6 +14,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+---
+## [1.1.9] - 2026-04-23
+### Added
+- Admin users page: "Sign in as user" dropdown option that calls BEM `POST /backend-manager/user/token` to generate a custom auth token, then shows a modal with the sign-in URL (copy button + open-in-new-tab button)
+- Modal opens immediately in a loading state while the token is generated, then swaps to ready/error state
+- Auth signin page: handle `authCustomToken` URL param via Firebase `signInWithCustomToken`, redirecting to `authReturnUrl` (validated) or `/dashboard`
+
+### Fixed
+- Billing section: cancel subscription button now appears for suspended paid subscriptions (previously hidden). Logic updated to `isPaid && rawStatus !== 'cancelled' && !resolved.cancelling` so it correctly shows for active, trialing, and suspended paid subs, while hiding for free users, already-cancelled subs, and subs with pending cancellation
+
+### Changed
+- Admin users table: dropdown trigger button restyled using `btn-outline-adaptive rounded-circle` for a cleaner look
+
+---
+## [1.1.8] - 2026-04-22
+### Changed
+- Widen backend sidebar from 282px to 283px so inner content (after `p-3` horizontal padding) clears the 250px minimum required by Google AdSense units
+- Apply same 283px width to mobile offcanvas sidebar (`#mobileSidebar`) via `--bs-offcanvas-width` to override Bootstrap's default 400px
+- Simplify admin firebase page cell rendering: drop redundant `String()` wrapping around values passed to `escapeHTML()` (already coerces to string internally)
+
 ---
 ## [1.1.7] - 2026-04-10
 ### Changed

package/dist/assets/css/core/_utilities.scss

@@ -82,9 +82,17 @@ button *, a * {
 // ============================================
 // Sidebar
 // ============================================
+// Inner content area MUST be > 250px to fit a 250px-wide Google AdSense unit.
+// Math: 250px content + 2 × 16px (p-3 horizontal padding) + 1px safety = 283px outer.
 .sidebar {
-  width: 282px;
-  min-width: 282px;
+  width: 283px;
+  min-width: 283px;
+}
+
+// Mobile offcanvas sidebar — override Bootstrap's default 400px.
+// Same math as above: 283px outer → ~251px inner content after p-3 padding.
+#mobileSidebar {
+  --bs-offcanvas-width: 283px;
 }
 
 .sidebar-logo {

package/dist/assets/js/core/auth.js

@@ -152,7 +152,15 @@ function updateAuthLinks() {
 
       $link.addEventListener('click', (e) => {
         const url = new URL($link.href, window.location.origin);
-        url.searchParams.set('authReturnUrl', window.location.href);
+        const currentUrl = new URL(window.location.href);
+        const existingReturnUrl = currentUrl.searchParams.get('authReturnUrl');
+
+        if (existingReturnUrl) {
+          url.searchParams.set('authReturnUrl', existingReturnUrl);
+        } else if (!authPaths.includes(currentUrl.pathname)) {
+          url.searchParams.set('authReturnUrl', window.location.href);
+        }
+
         $link.href = url.toString();
       });
     } catch (e) {}

package/dist/assets/js/libs/auth.js

@@ -22,6 +22,12 @@ export default function () {
     // Check for authSignout parameter first
     await handleAuthSignout();
 
+    // Check for authCustomToken parameter (admin impersonation / custom token sign-in)
+    const customTokenHandled = await handleCustomTokenSignin();
+    if (customTokenHandled) {
+      return;
+    }
+
     // Initialize the appropriate form based on the page (with autoReady: false)
     initializePageForm();
 
@@ -209,6 +215,48 @@ export default function () {
     }
   }
 
+  async function handleCustomTokenSignin() {
+    const url = new URL(window.location.href);
+    const customToken = url.searchParams.get('authCustomToken');
+
+    if (!customToken) {
+      return false;
+    }
+
+    try {
+      console.log('[Auth] Signing in with custom token');
+
+      const { getAuth, signInWithCustomToken } = await import('@firebase/auth');
+      const auth = getAuth();
+
+      const userCredential = await signInWithCustomToken(auth, customToken);
+      console.log('[Auth] Custom token sign-in successful:', userCredential.user.email || userCredential.user.uid);
+
+      trackLogin('custom-token', userCredential.user);
+
+      const authReturnUrl = url.searchParams.get('authReturnUrl');
+      const redirectTo = authReturnUrl && webManager.isValidRedirectUrl(authReturnUrl)
+        ? authReturnUrl
+        : '/dashboard';
+
+      window.location.href = redirectTo;
+      return true;
+    } catch (error) {
+      webManager.sentry().captureException(new Error('Custom token sign-in error', { cause: error }));
+      console.error('[Auth] Custom token sign-in failed:', error);
+
+      const url = new URL(window.location.href);
+      url.searchParams.delete('authCustomToken');
+      window.history.replaceState({}, document.title, url.toString());
+
+      webManager.utilities().showNotification(
+        `Custom token sign-in failed: ${error.message || 'Invalid or expired token'}`,
+        { type: 'danger', timeout: 8000 }
+      );
+      return false;
+    }
+  }
+
   async function handleAuthSignout() {
     const url = new URL(window.location.href);
     const authSignout = url.searchParams.get('authSignout');

package/dist/assets/js/pages/account/sections/billing.js

@@ -140,7 +140,7 @@ function buildBillingState(account) {
         upgrade: !isPaid || rawStatus === 'cancelled',
         change: resolved.active,
         manage: isPaid && rawStatus !== 'cancelled',
-        cancel: resolved.active,
+        cancel: isPaid && rawStatus !== 'cancelled' && !resolved.cancelling,
       },
     },
   };

package/dist/assets/js/pages/admin/firebase/index.js

@@ -303,7 +303,7 @@ function renderDocuments() {
 
       columns.forEach((col) => {
         const value = getNestedValue(doc.data, col);
-        cells += `<td class="small text-truncate" style="max-width: 180px;" title="${webManager.utilities().escapeHTML(String(value ?? ''))}">${renderCellValue(value)}</td>`;
+        cells += `<td class="small text-truncate" style="max-width: 180px;" title="${webManager.utilities().escapeHTML(value ?? '')}">${renderCellValue(value)}</td>`;
       });
 
       cells += `<td>
@@ -408,7 +408,7 @@ function renderCellValue(value) {
   if (typeof value === 'number') {
     // Check if it looks like a UNIX timestamp (reasonable range)
     if (value > 1000000000 && value < 10000000000) {
-      return `<span title="${webManager.utilities().escapeHTML(String(value))}">${webManager.utilities().escapeHTML(new Date(value * 1000).toLocaleDateString())}</span>`;
+      return `<span title="${webManager.utilities().escapeHTML(value)}">${webManager.utilities().escapeHTML(new Date(value * 1000).toLocaleDateString())}</span>`;
     }
     return webManager.utilities().escapeHTML(value.toLocaleString());
   }

package/dist/assets/js/pages/admin/users/index.js

@@ -172,7 +172,7 @@ function renderUsers() {
       <td class="text-muted small">${updatedText}</td>
       <td>
         <div class="dropdown">
-          <button class="btn btn-sm btn-link p-0" type="button" data-bs-toggle="dropdown">
+          <button class="btn btn-sm btn-adaptive rounded-circle" type="button" data-bs-toggle="dropdown">
             ${getPrerenderedIcon('ellipsis-vertical', 'fa-sm')}
           </button>
           <ul class="dropdown-menu dropdown-menu-end">
@@ -192,6 +192,10 @@ function renderUsers() {
               ${getPrerenderedIcon('fire', 'fa-sm me-2')}
               View in Explorer
             </a></li>
+            <li><a class="dropdown-item small btn-signin-as" href="#">
+              ${getPrerenderedIcon('right-to-bracket', 'fa-sm me-2')}
+              Sign in as user
+            </a></li>
             <li><hr class="dropdown-divider"></li>
             <li><a class="dropdown-item small text-danger btn-delete-user" href="#">
               ${getPrerenderedIcon('trash', 'fa-sm me-2')}
@@ -223,6 +227,11 @@ function renderUsers() {
       window.location.href = `/admin/firebase?collection=users&doc=${uid}`;
     });
 
+    $row.querySelector('.btn-signin-as').addEventListener('click', (e) => {
+      e.preventDefault();
+      signInAsUser(uid, email);
+    });
+
     $row.querySelector('.btn-delete-user').addEventListener('click', (e) => {
       e.preventDefault();
       deleteUser(uid, email);
@@ -269,6 +278,105 @@ function viewUser(uid, userData) {
   modal.show();
 }
 
+async function signInAsUser(uid, email) {
+  openSignInAsModalLoading(email);
+
+  try {
+    const response = await authorizedFetch(`${webManager.getApiUrl()}/backend-manager/user/token`, {
+      method: 'POST',
+      timeout: 30000,
+      response: 'json',
+      tries: 1,
+      log: true,
+      body: { uid: uid },
+    });
+
+    const token = response?.token;
+    if (!token) {
+      throw new Error('No token returned from server');
+    }
+
+    const signinUrl = new URL('/signin', window.location.origin);
+    signinUrl.searchParams.set('authSignout', 'true');
+    signinUrl.searchParams.set('authCustomToken', token);
+    signinUrl.searchParams.set('authReturnUrl', '/dashboard');
+
+    showSignInAsModalReady(email, signinUrl.toString());
+  } catch (error) {
+    console.error('Failed to create sign-in link:', error);
+    showSignInAsModalError(error.message || 'Unknown error');
+  }
+}
+
+function openSignInAsModalLoading(email) {
+  const $loading = document.getElementById('signin-as-loading');
+  const $ready = document.getElementById('signin-as-ready');
+  const $error = document.getElementById('signin-as-error');
+  const $loadingEmail = document.getElementById('signin-as-loading-email');
+  const $navigateBtn = document.getElementById('btn-signin-as-navigate');
+
+  if ($loading) $loading.classList.remove('d-none');
+  if ($ready) $ready.classList.add('d-none');
+  if ($error) $error.classList.add('d-none');
+  if ($navigateBtn) $navigateBtn.classList.add('d-none');
+  if ($loadingEmail) $loadingEmail.textContent = email;
+
+  const modal = bootstrap.Modal.getOrCreateInstance(document.getElementById('signin-as-modal'));
+  modal.show();
+}
+
+function showSignInAsModalReady(email, urlString) {
+  const $loading = document.getElementById('signin-as-loading');
+  const $ready = document.getElementById('signin-as-ready');
+  const $error = document.getElementById('signin-as-error');
+  const $email = document.getElementById('signin-as-email');
+  const $url = document.getElementById('signin-as-url');
+  const $copyBtn = document.getElementById('btn-signin-as-copy');
+  const $navigateBtn = document.getElementById('btn-signin-as-navigate');
+
+  if ($loading) $loading.classList.add('d-none');
+  if ($error) $error.classList.add('d-none');
+  if ($ready) $ready.classList.remove('d-none');
+  if ($navigateBtn) $navigateBtn.classList.remove('d-none');
+  if ($email) $email.textContent = email;
+  if ($url) $url.value = urlString;
+
+  if ($copyBtn) {
+    $copyBtn.onclick = async () => {
+      await navigator.clipboard.writeText(urlString).catch(() => {});
+      const originalHTML = $copyBtn.innerHTML;
+      $copyBtn.innerHTML = `${getPrerenderedIcon('circle-check', 'fa-sm')}`;
+      $copyBtn.classList.add('btn-success');
+      $copyBtn.classList.remove('btn-outline-adaptive');
+      setTimeout(() => {
+        $copyBtn.innerHTML = originalHTML;
+        $copyBtn.classList.remove('btn-success');
+        $copyBtn.classList.add('btn-outline-adaptive');
+      }, 1500);
+    };
+  }
+
+  if ($navigateBtn) {
+    $navigateBtn.onclick = () => {
+      window.open(urlString, '_blank', 'noopener');
+    };
+  }
+}
+
+function showSignInAsModalError(message) {
+  const $loading = document.getElementById('signin-as-loading');
+  const $ready = document.getElementById('signin-as-ready');
+  const $error = document.getElementById('signin-as-error');
+  const $errorMessage = document.getElementById('signin-as-error-message');
+  const $navigateBtn = document.getElementById('btn-signin-as-navigate');
+
+  if ($loading) $loading.classList.add('d-none');
+  if ($ready) $ready.classList.add('d-none');
+  if ($error) $error.classList.remove('d-none');
+  if ($navigateBtn) $navigateBtn.classList.add('d-none');
+  if ($errorMessage) $errorMessage.textContent = message;
+}
+
 async function deleteUser(uid, email) {
   if (!confirm(`Delete user ${email} (${uid})?\n\nThis will permanently delete their account and cannot be undone.`)) {
     return;

package/dist/assets/themes/classy/css/layout/_navigation.scss

@@ -426,7 +426,7 @@
 // Backend Layout Components
 // ============================================
 .sidebar {
-  width: 282px;
+  width: 283px;
 
   .sidebar-logo {
     height: 60px; // Fixed height for logo section

package/dist/defaults/dist/_layouts/blueprint/admin/users/index.html

@@ -28,6 +28,10 @@ prerender_icons:
   - name: "trash"
   - name: "ellipsis-vertical"
   - name: "copy"
+  - name: "right-to-bracket"
+  - name: "circle-check"
+  - name: "arrow-up-right-from-square"
+  - name: "circle-xmark"
 ---
 
 <!-- Page Header Actions -->
@@ -181,6 +185,64 @@ prerender_icons:
   </div>
 </div>
 
+<!-- Sign In As User Modal -->
+<div class="modal fade" id="signin-as-modal" tabindex="-1" aria-labelledby="signin-as-modal-label" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h6 class="modal-title" id="signin-as-modal-label">Sign in as user</h6>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Loading State -->
+      <div class="modal-body text-center py-5" id="signin-as-loading">
+        <div class="spinner-border text-primary mb-3" role="status">
+          <span class="visually-hidden">Loading...</span>
+        </div>
+        <h5 class="mb-2">Generating sign-in link</h5>
+        <p class="text-muted mb-0">
+          Creating a one-time token for <strong id="signin-as-loading-email" class="text-body"></strong>...
+        </p>
+      </div>
+
+      <!-- Ready State -->
+      <div class="modal-body text-center d-none" id="signin-as-ready">
+        <div class="rounded-circle d-inline-flex align-items-center justify-content-center p-3 bg-success bg-opacity-10 mx-auto mb-3">
+          {% uj_icon "circle-check", "fa-2xl text-success" %}
+        </div>
+        <h5 class="mb-2">Sign-in link ready</h5>
+        <p class="text-muted mb-3">
+          A one-time sign-in link for <strong id="signin-as-email" class="text-body"></strong> has been generated. Open it in an incognito window to avoid signing out of your admin session.
+        </p>
+        <div class="input-group mb-2">
+          <input type="text" class="form-control form-control-sm font-monospace" id="signin-as-url" readonly>
+          <button type="button" class="btn btn-sm btn-outline-adaptive" id="btn-signin-as-copy">
+            {% uj_icon "copy", "fa-sm" %}
+          </button>
+        </div>
+        <small class="text-muted d-block">The link contains a short-lived custom token</small>
+      </div>
+
+      <!-- Error State -->
+      <div class="modal-body text-center py-5 d-none" id="signin-as-error">
+        <div class="rounded-circle d-inline-flex align-items-center justify-content-center p-3 bg-danger bg-opacity-10 mx-auto mb-3">
+          {% uj_icon "circle-xmark", "fa-2xl text-danger" %}
+        </div>
+        <h5 class="mb-2">Failed to generate link</h5>
+        <p class="text-muted mb-0" id="signin-as-error-message"></p>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-sm btn-outline-adaptive" data-bs-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-sm btn-adaptive d-none" id="btn-signin-as-navigate">
+          {% uj_icon "arrow-up-right-from-square", "fa-sm me-1" %}
+          Open in new tab
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- User Edit Modal -->
 <div class="modal fade" id="user-edit-modal" tabindex="-1" aria-labelledby="user-edit-modal-label" aria-hidden="true">
   <div class="modal-dialog">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {