docula 1.2.0 → 1.5.0

package/templates/modern/includes/scripts.hbs

@@ -90,43 +90,32 @@
   })();
 </script>
 {{#if cookieAuth}}
-<div id="cookie-auth-config" hidden data-cookie-name="{{#if cookieAuth.cookieName}}{{cookieAuth.cookieName}}{{else}}token{{/if}}"{{#if cookieAuth.logoutUrl}} data-logout-url="{{cookieAuth.logoutUrl}}"{{/if}}></div>
+<div id="cookie-auth-config" hidden{{#if cookieAuth.logoutUrl}} data-logout-url="{{cookieAuth.logoutUrl}}"{{/if}}{{#if cookieAuth.authCheckUrl}} data-auth-check-url="{{cookieAuth.authCheckUrl}}"{{/if}}{{#if cookieAuth.authCheckMethod}} data-auth-check-method="{{cookieAuth.authCheckMethod}}"{{/if}}{{#if cookieAuth.authCheckUserPath}} data-auth-check-user-path="{{cookieAuth.authCheckUserPath}}"{{/if}}></div>
 <script>
   (function() {
     var configEl = document.getElementById('cookie-auth-config');
     if (!configEl) return;
-    var cookieName = configEl.getAttribute('data-cookie-name');
     var logoutUrl = configEl.getAttribute('data-logout-url');
-    function isSafeUrl(url) {
-      if (!url) return false;
-      try {
-        var parsed = new URL(url, window.location.origin);
-        return parsed.origin === window.location.origin;
-      } catch (e) {
-        return false;
+    var authCheckUrl = configEl.getAttribute('data-auth-check-url');
+    var authCheckMethod = configEl.getAttribute('data-auth-check-method') || 'GET';
+    var authCheckUserPath = configEl.getAttribute('data-auth-check-user-path');
+    function getNestedValue(obj, path) {
+      if (!path) return null;
+      var parts = path.split('.');
+      var current = obj;
+      for (var i = 0; i < parts.length; i++) {
+        if (current == null || typeof current !== 'object') return null;
+        current = current[parts[i]];
       }
+      return current || null;
     }
-    function getCookieValue() {
-      var match = document.cookie.split(';').find(function(c) {
-        return c.trim().startsWith(cookieName + '=');
-      });
-      return match ? match.trim().substring(cookieName.length + 1) : null;
-    }
-    function getDisplayName(token) {
-      try {
-        var payload = token.split('.')[1];
-        if (!payload) return null;
-        var json = atob(payload.replace(/-/g, '+').replace(/_/g, '/'));
-        var claims = JSON.parse(json);
-        return claims.name || claims.preferred_username || claims.email || null;
-      } catch (e) {
-        return null;
-      }
-    }
-    function updateAuthUI() {
-      var token = getCookieValue();
-      var loggedIn = !!token;
-      var displayName = loggedIn ? getDisplayName(token) : null;
+    var cachedAuth = null;
+    try { cachedAuth = JSON.parse(localStorage.getItem('docula-auth-state')); } catch(e) {}
+    window.__doculaAuth = cachedAuth || { loggedIn: false, displayName: null };
+    function setAuthUI(loggedIn, displayName) {
+      window.__doculaAuth = { loggedIn: loggedIn, displayName: displayName };
+      try { localStorage.setItem('docula-auth-state', JSON.stringify(window.__doculaAuth)); } catch(e) {}
+      document.dispatchEvent(new CustomEvent('docula-auth-change'));
       var els = [
         { login: document.getElementById('cookie-auth-login'), logout: document.getElementById('cookie-auth-logout'), user: document.getElementById('cookie-auth-user') },
         { login: document.getElementById('cookie-auth-login-mobile'), logout: document.getElementById('cookie-auth-logout-mobile'), user: document.getElementById('cookie-auth-user-mobile') }
@@ -140,8 +129,29 @@
         }
       });
     }
+    function checkAuth() {
+      if (!authCheckUrl) return;
+      fetch(authCheckUrl, { method: authCheckMethod, credentials: 'include' }).then(function(res) {
+        if (!res.ok) {
+          setAuthUI(false, null);
+          return;
+        }
+        if (authCheckUserPath) {
+          res.json().then(function(data) {
+            setAuthUI(true, getNestedValue(data, authCheckUserPath));
+          }).catch(function() {
+            setAuthUI(true, null);
+          });
+        } else {
+          setAuthUI(true, null);
+        }
+      }).catch(function() {
+        setAuthUI(false, null);
+      });
+    }
     document.addEventListener('DOMContentLoaded', function() {
-      updateAuthUI();
+      if (cachedAuth) setAuthUI(cachedAuth.loggedIn, cachedAuth.displayName);
+      checkAuth();
       var logoutEls = [
         document.getElementById('cookie-auth-logout'),
         document.getElementById('cookie-auth-logout-mobile')
@@ -149,10 +159,9 @@
       logoutEls.forEach(function(el) {
         if (el) {
           el.addEventListener('click', function() {
-            if (isSafeUrl(logoutUrl)) {
+            if (logoutUrl) {
               window.location.href = logoutUrl;
             } else {
-              document.cookie = cookieName + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/';
               window.location.reload();
             }
           });

package/templates/modern/js/api.js

@@ -130,11 +130,9 @@ document.addEventListener('DOMContentLoaded', function() {
         authValueInput.value = '';
         if (cookieStatusEl) {
           cookieStatusEl.classList.remove('api-auth__cookie-status--hidden');
-          var configEl = document.getElementById('cookie-auth-config');
-          var cookieName = configEl ? configEl.getAttribute('data-cookie-name') : (data.name || 'token');
-          var hasCookie = document.cookie.split(';').some(function(c) { return c.trim().startsWith(cookieName + '='); });
-          cookieStatusEl.textContent = hasCookie ? 'Logged in' : 'Not logged in — use Login button above';
-          cookieStatusEl.className = 'api-auth__cookie-status' + (hasCookie ? ' api-auth__cookie-status--ok' : ' api-auth__cookie-status--warn');
+          var auth = window.__doculaAuth || { loggedIn: false };
+          cookieStatusEl.textContent = auth.loggedIn ? 'Logged in' : 'Not logged in — use Login button above';
+          cookieStatusEl.className = 'api-auth__cookie-status' + (auth.loggedIn ? ' api-auth__cookie-status--ok' : ' api-auth__cookie-status--warn');
         }
       } else {
         authValueInput.classList.remove('api-auth__value--hidden');
@@ -148,7 +146,20 @@ document.addEventListener('DOMContentLoaded', function() {
         if (cookieStatusEl) cookieStatusEl.classList.add('api-auth__cookie-status--hidden');
       }
     }
-    authTypeSelect.addEventListener('change', updateAuthUI);
+    var savedAuth = localStorage.getItem('docula-api-auth-type');
+    if (savedAuth) {
+      for (var i = 0; i < authTypeSelect.options.length; i++) {
+        if (authTypeSelect.options[i].value === savedAuth) {
+          authTypeSelect.selectedIndex = i;
+          break;
+        }
+      }
+    }
+    authTypeSelect.addEventListener('change', function() {
+      localStorage.setItem('docula-api-auth-type', authTypeSelect.value);
+      updateAuthUI();
+    });
+    document.addEventListener('docula-auth-change', updateAuthUI);
     updateAuthUI();
   }