ultimate-jekyll-manager 0.0.197 → 0.0.199

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

@@ -1,5 +1,8 @@
 import authorizedFetch from '__main_assets__/js/libs/authorized-fetch.js';
 
+// Constants
+const SIGNUP_MAX_AGE = 5 * 60 * 1000;
+
 // Auth Module
 export default function (Manager, options) {
   // Shortcuts
@@ -45,22 +48,8 @@ export default function (Manager, options) {
       if (user) {
         // User is authenticated
 
-        // Check if this is a new user account (created in last 5 minutes) and send metadata
-        const accountAge = Date.now() - new Date(user.metadata.creationTime).getTime();
-        const fiveMinutes = 5 * 60 * 1000;
-
-        /* @dev-only:start */
-        {
-          // Log account age for debugging
-          const ageInMinutes = Math.floor(accountAge / 1000 / 60);
-          console.log('[Auth] Account age:', ageInMinutes, 'minutes');
-        }
-        /* @dev-only:end */
-
         // Send user signup metadata if account is new
-        if (accountAge < fiveMinutes) {
-          await sendUserSignupMetadata(user, webManager);
-        }
+        await sendUserSignupMetadata(user, webManager);
 
         // Check if page requires user to be unauthenticated (e.g., signin page)
         if (policy === 'unauthenticated') {
@@ -167,45 +156,54 @@ function setAnalyticsUserId(user, webManager) {
 // Send user metadata to server (affiliate, UTM params, etc.)
 async function sendUserSignupMetadata(user, webManager) {
   try {
-    // Get affiliate data from storage
-    const affiliateData = webManager.storage().get('marketing.affiliate', null);
-    const utmData = webManager.storage().get('marketing.utm', null);
-    const signupSent = webManager.storage().get('marketing.signupSent', false);
+    // Check if this is a new user account (created in last 5 minutes)
+    const accountAge = Date.now() - new Date(user.metadata.creationTime).getTime();
+    const signupProcessed = webManager.storage().get('flags.signupProcessed', false);
+
+    /* @dev-only:start */
+    {
+      // Log account age for debugging
+      const ageInMinutes = Math.floor(accountAge / 1000 / 60);
+      console.log('[Auth] Account age:', ageInMinutes, 'minutes, signupProcessed:', signupProcessed);
+    }
+    /* @dev-only:end */
 
-    // Only proceed if we haven't sent signup metadata yet
-    if (signupSent) {
+    // Only proceed if account is new and we haven't sent signup metadata yet
+    if (accountAge >= SIGNUP_MAX_AGE || signupProcessed) {
       return;
     }
 
+    // Get attribution data from storage
+    const attribution = webManager.storage().get('attribution', {});
+
     // Build the payload
     const payload = {
-      // @TODO: REMOVE ONCE LEGACY SERVER CODE IS GONE
-      affiliateCode: affiliateData?.code || '',
+      // Legacy support (can be removed once all servers are updated)
+      affiliateCode: attribution.affiliate?.code || '',
 
       // New structure
-      affiliateData: affiliateData || {},
-      utmData: utmData || {},
+      attribution: attribution,
       context: webManager.utilities().getContext(),
     };
 
     // Get server API URL
-    const serverApiURL = `${webManager.getApiUrl()}/backend-manager`;
+    const serverApiURL = `${webManager.getApiUrl()}/backend-manager/user/signup`;
+
+    // Log
+    console.log('[Auth] Sending user metadata:', payload);
 
     // Make API call to send signup metadata
     const response = await authorizedFetch(serverApiURL, {
       method: 'POST',
       response: 'json',
-      body: {
-        command: 'user:sign-up',
-        payload: payload
-      }
+      body: payload,
     });
 
     // Log
     console.log('[Auth] User metadata sent successfully:', response);
 
-    // Mark signup as sent (keep the marketing data for reference)
-    webManager.storage().set('marketing.signupSent', true);
+    // Mark signup as sent (keep the attribution data for reference)
+    webManager.storage().set('flags.signupProcessed', true);
   } catch (error) {
     console.error('[Auth] Error sending user metadata:', error);
     // Don't throw - we don't want to block the signup flow

package/dist/assets/js/core/query-strings.js

@@ -12,14 +12,22 @@ export default function (Manager, options) {
     // Get URL parameters
     const urlParams = new URLSearchParams(window.location.search);
 
+    // Get current attribution data
+    const attribution = webManager.storage().get('attribution', {});
+
     // Process affiliate/referral parameters
-    processAffiliateParams(urlParams);
+    processAffiliateParams(urlParams, attribution);
 
     // Process UTM parameters
-    processUTMParams(urlParams);
+    processUTMParams(urlParams, attribution);
+
+    // Save updated attribution if anything changed
+    if (Object.keys(attribution).length > 0) {
+      webManager.storage().set('attribution', attribution);
+    }
   }
 
-  function processAffiliateParams(urlParams) {
+  function processAffiliateParams(urlParams, attribution) {
     // Check for aff or ref parameter
     const affParam = urlParams.get('aff') || urlParams.get('ref');
 
@@ -28,19 +36,16 @@ export default function (Manager, options) {
       return;
     }
 
-    // Save to localStorage with timestamp
-    const affiliateData = {
+    // Save affiliate data to attribution object
+    attribution.affiliate = {
       code: affParam,
       timestamp: new Date().toISOString(),
       url: window.location.href,
       page: window.location.pathname
     };
-
-    // Use webManager storage to save affiliate data
-    webManager.storage().set('marketing.affiliate', affiliateData);
   }
 
-  function processUTMParams(urlParams) {
+  function processUTMParams(urlParams, attribution) {
     // Define UTM parameters to capture
     const utmParams = [
       'utm_source',
@@ -69,12 +74,11 @@ export default function (Manager, options) {
       return;
     }
 
-    // Add metadata
+    // Add metadata and save to attribution object
     utmData.timestamp = new Date().toISOString();
     utmData.url = window.location.href;
     utmData.page = window.location.pathname;
 
-    // Save to localStorage
-    webManager.storage().set('marketing.utm', utmData);
+    attribution.utm = utmData;
   }
 }

package/dist/assets/js/pages/account/sections/api-keys.js

@@ -65,7 +65,7 @@ function setupResetApiKeyForm() {
     }
 
     // Get server API URL
-    const serverApiURL = `${webManager.getApiUrl()}/backend-manager`;
+    const serverApiURL = `${webManager.getApiUrl()}/backend-manager/user/api-keys`;
 
     // Make API call to reset API key
     const response = await authorizedFetch(serverApiURL, {
@@ -73,9 +73,6 @@ function setupResetApiKeyForm() {
       timeout: 30000,
       response: 'json',
       tries: 2,
-      body: {
-        command: 'user:regenerate-api-keys',
-      },
     });
 
     if (!response.privateKey) {

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

@@ -16,7 +16,7 @@ const supportedProviders = ['google', 'discord', 'github', 'twitter', 'facebook'
 
 // Get API URL helper
 function getApiUrl() {
-  return `${webManager.getApiUrl()}/backend-manager`;
+  return `${webManager.getApiUrl()}/backend-manager/user/oauth2`;
 }
 
 // Initialize connections section
@@ -295,14 +295,11 @@ async function handleConnect(providerId) {
     response: 'json',
     tries: 2,
     body: {
-      command: 'user:oauth2',
-      payload: {
-        redirect: false,
-        provider: providerId,
-        state: 'authorize',
-        scope: scope,
-        referrer: window.location.href,
-      },
+      redirect: false,
+      provider: providerId,
+      state: 'authorize',
+      scope: scope,
+      referrer: window.location.href,
     },
   });
 
@@ -338,14 +335,11 @@ async function handleDisconnect(providerId) {
     response: 'json',
     tries: 2,
     body: {
-      command: 'user:oauth2',
-      payload: {
-        redirect: false,
-        provider: providerId,
-        state: 'deauthorize',
-        scope: scope,
-        referrer: window.location.href,
-      },
+      redirect: false,
+      provider: providerId,
+      state: 'deauthorize',
+      scope: scope,
+      referrer: window.location.href,
     },
   });
 

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

@@ -70,17 +70,14 @@ function setupDeleteAccountForm() {
     }
 
     // Send delete request to server
-    const response = await authorizedFetch(webManager.getApiUrl(), {
-      method: 'POST',
+    const response = await authorizedFetch(`${webManager.getApiUrl()}/backend-manager/user`, {
+      method: 'DELETE',
       timeout: 30000,
       response: 'json',
       tries: 2,
       body: {
-        command: 'user:delete',
-        payload: {
-          reason: data.reason || '',
-          confirmed: true,
-        },
+        reason: data.reason || '',
+        confirmed: true,
       },
     });
 

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

@@ -198,17 +198,13 @@ async function updateActiveSessions(account) {
 
   // Fetch other active sessions from server
   try {
-    const serverApiURL = `${webManager.getApiUrl()}/backend-manager`;
+    const serverApiURL = `${webManager.getApiUrl()}/backend-manager/user/sessions`;
 
     const data = await authorizedFetch(serverApiURL, {
-      method: 'POST',
+      method: 'GET',
       timeout: 60000,
       response: 'json',
       tries: 2,
-      body: {
-        command: 'user:get-active-sessions',
-        payload: {},
-      },
     });
 
     // Process sessions from server response

package/dist/assets/js/pages/admin/notifications/new/index.js

@@ -240,7 +240,7 @@ function transformDataForAPI(formData) {
 
 // Send notification via API
 async function sendNotification(payload) {
-  const functionsUrl = getAPIFunctionsUrl();
+  const functionsUrl = `${getAPIFunctionsUrl()}/admin/notification`;
 
   return authorizedFetch(functionsUrl, {
     method: 'POST',
@@ -248,28 +248,19 @@ async function sendNotification(payload) {
     response: 'json',
     tries: 1,
     log: true,
-    body: {
-      command: 'admin:send-notification',
-      payload: payload,
-    },
+    body: payload,
   });
 }
 
 // Fetch user statistics
 async function fetchUserStats() {
   try {
-    const response = await authorizedFetch(getAPIFunctionsUrl(), {
-      method: 'POST',
+    const response = await authorizedFetch(`${getAPIFunctionsUrl()}/admin/firestore?path=meta/stats`, {
+      method: 'GET',
       timeout: 60000,
       response: 'json',
       tries: 2,
       log: true,
-      body: {
-        command: 'admin:firestore-read',
-        payload: {
-          path: 'meta/stats',
-        },
-      },
     });
 
     // Extract user count from response
@@ -477,9 +468,7 @@ function clearAutoSubmitCountdown() {
 
 // Get API functions URL
 function getAPIFunctionsUrl() {
-  // Get functions URL from webManager and add the endpoint
-  //@TODO remove this when fixed api url
-  return `${webManager.getFunctionsUrl('prod')}/bm_api`;
+  return `${webManager.getApiUrl()}/backend-manager`;
 }
 
 // Tracking functions

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

@@ -196,17 +196,14 @@ function setupMobileEmailForms() {
       console.log('Mobile email form submitted:', { platform, email: data.email });
 
       // Get API endpoint
-      const apiEndpoint = `${webManager.getApiUrl()}/backend-manager`;
+      const apiEndpoint = `${webManager.getApiUrl()}/backend-manager/general/email`;
 
       // Send request using wonderful-fetch
       await fetch(apiEndpoint, {
         method: 'POST',
         body: {
-          command: 'general:send-email',
-          payload: {
-            id: 'general:download-app-link',
-            email: data.email,
-          },
+          id: 'general:download-app-link',
+          email: data.email,
         },
         response: 'json',
         timeout: 30000,

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

@@ -100,16 +100,16 @@ async function handleOAuthCallback() {
 
     console.log('Tokenize payload:', payload);
 
+    // Build the RESTful URL (replace /backend-manager with /backend-manager/user/oauth2)
+    const serverUrl = stateParsed.serverUrl.replace(/\/backend-manager\/?$/, '/backend-manager/user/oauth2');
+
     // Call server to complete OAuth flow
-    const response = await authorizedFetch(stateParsed.serverUrl, {
+    const response = await authorizedFetch(serverUrl, {
       method: 'POST',
       timeout: 60000,
       response: 'json',
       tries: 2,
-      body: {
-        command: 'user:oauth2',
-        payload: payload
-      }
+      body: payload,
     });
 
     console.log('Tokenize response:', response);

package/dist/assets/js/pages/payment/checkout/modules/session.js

@@ -44,7 +44,7 @@ export function buildPaymentIntentData(webManager) {
   }
 
   // Get UTM parameters from storage
-  const utmData = webManager.storage().get('marketing.utm');
+  const utmData = webManager.storage().get('attribution.utm');
   let utm = {};
 
   // Check if stored UTM data exists and is less than 30 days old

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

@@ -4,6 +4,7 @@
 
 // Libraries
 import { FormManager } from '__main_assets__/js/libs/form-manager.js';
+import fetch from 'wonderful-fetch';
 
 let webManager = null;
 
@@ -21,6 +22,7 @@ export default (Manager) => {
     initializeSubscribeForm();
     initializeTooltips();
     initializeRefreshTimer();
+    initializeBuildInfo();
 
     // Fetch status data (if configured)
     fetchStatusData();
@@ -41,6 +43,14 @@ const config = {
     incidentsList: '#incidents-list',
     incidentsEmpty: '#incidents-empty',
     subscribeForm: '#status-subscribe-form',
+    buildInfoLoading: '#build-info-loading',
+    buildInfoContent: '#build-info-content',
+    buildInfoError: '#build-info-error',
+    buildTime: '#build-time',
+    buildTimeAgo: '#build-time-ago',
+    buildEnvironment: '#build-environment',
+    buildPackages: '#build-packages',
+    buildRepo: '#build-repo',
   },
   // Maps status levels to Bootstrap bg-* classes
   statusClasses: {
@@ -234,6 +244,148 @@ function initializeRefreshTimer() {
   }, 1000);
 }
 
+// Initialize build info section
+async function initializeBuildInfo() {
+  const $loading = document.querySelector(config.selectors.buildInfoLoading);
+  const $content = document.querySelector(config.selectors.buildInfoContent);
+  const $error = document.querySelector(config.selectors.buildInfoError);
+
+  if (!$loading || !$content) {
+    return;
+  }
+
+  try {
+    // Fetch build.json
+    const data = await fetch(`${window.location.origin}/build.json`, {
+      response: 'json',
+    });
+
+    console.log('Build info data:', data);
+
+    // Normalize the data structure
+    const buildData = {
+      timestamp: data.timestamp || null,
+      environment: data.environment || (data.serving ? 'development' : 'production'),
+      packages: data.packages || null,
+      repo: data.repo || null,
+    };
+
+    // Test older dates
+    // buildData.timestamp = Date.now() - 1000 * 60 * 60 * 24 * 7;
+
+    displayBuildInfo(buildData);
+    $loading.classList.add('d-none');
+    $content.classList.remove('d-none');
+  } catch (error) {
+    console.error('Failed to load build info:', error);
+    $loading.classList.add('d-none');
+    if ($error) {
+      $error.classList.remove('d-none');
+    }
+  }
+}
+
+// Display build information
+function displayBuildInfo(data) {
+  const $time = document.querySelector(config.selectors.buildTime);
+  const $timeAgo = document.querySelector(config.selectors.buildTimeAgo);
+  const $environment = document.querySelector(config.selectors.buildEnvironment);
+  const $packages = document.querySelector(config.selectors.buildPackages);
+  const $repo = document.querySelector(config.selectors.buildRepo);
+
+  // Build time
+  if ($time && data.timestamp) {
+    const buildDate = new Date(data.timestamp);
+    $time.textContent = buildDate.toLocaleString('en-US', {
+      weekday: 'short',
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      hour: 'numeric',
+      minute: '2-digit',
+      hour12: true,
+    });
+  }
+
+  // Time ago (and keep it updated every second)
+  if ($timeAgo && data.timestamp) {
+    updateTimeAgo($timeAgo, data.timestamp);
+    setInterval(() => updateTimeAgo($timeAgo, data.timestamp), 1000);
+  }
+
+  // Environment
+  if ($environment && data.environment) {
+    const envText = data.environment.charAt(0).toUpperCase() + data.environment.slice(1);
+    const envClass = data.environment === 'production' ? 'text-success' : 'text-warning';
+    $environment.innerHTML = `<span class="${envClass}">${escapeHtml(envText)}</span>`;
+  }
+
+  // Packages
+  if ($packages && data.packages) {
+    const packageBadges = Object.entries(data.packages)
+      .map(([name, version]) => {
+        return `<span class="badge bg-body-secondary text-body fw-normal">${escapeHtml(name)}: <span class="fw-semibold">${escapeHtml(version)}</span></span>`;
+      })
+      .join('');
+    $packages.innerHTML = packageBadges;
+  }
+
+  // Repository
+  if ($repo && data.repo) {
+    const repoUrl = `https://github.com/${data.repo.user}/${data.repo.name}`;
+    $repo.innerHTML = `<a href="${repoUrl}" target="_blank" rel="noopener noreferrer" class="text-decoration-none">${escapeHtml(data.repo.user)}/${escapeHtml(data.repo.name)}</a>`;
+  }
+}
+
+// Update relative time display
+function updateTimeAgo($element, timestamp) {
+  const buildDate = new Date(timestamp);
+  const now = new Date();
+  const diffMs = now - buildDate;
+  const totalSeconds = Math.floor(diffMs / 1000);
+
+  if (totalSeconds <= 0) {
+    $element.textContent = 'Just now';
+    return;
+  }
+
+  // Calculate each unit
+  const years = Math.floor(totalSeconds / (365 * 24 * 60 * 60));
+  const months = Math.floor((totalSeconds % (365 * 24 * 60 * 60)) / (30 * 24 * 60 * 60));
+  const days = Math.floor((totalSeconds % (30 * 24 * 60 * 60)) / (24 * 60 * 60));
+  const hours = Math.floor((totalSeconds % (24 * 60 * 60)) / (60 * 60));
+  const minutes = Math.floor((totalSeconds % (60 * 60)) / 60);
+  const seconds = totalSeconds % 60;
+
+  // Build parts - once we start, include all remaining units
+  const parts = [];
+  let started = false;
+
+  if (years > 0) {
+    parts.push(`${years}y`);
+    started = true;
+  }
+  if (started || months > 0) {
+    parts.push(`${months}mo`);
+    started = true;
+  }
+  if (started || days > 0) {
+    parts.push(`${days}d`);
+    started = true;
+  }
+  if (started || hours > 0) {
+    parts.push(`${hours}h`);
+    started = true;
+  }
+  if (started || minutes > 0) {
+    parts.push(`${minutes}m`);
+    started = true;
+  }
+  parts.push(`${seconds}s`);
+
+  $element.textContent = parts.join(' ') + ' ago';
+}
+
 // Fetch status data from API (if configured)
 function fetchStatusData() {
   // Check if there's a status API endpoint configured

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

@@ -68,17 +68,13 @@ export default function (Manager) {
 
   // Generate custom token via backend-manager API
   async function generateCustomToken(webManager) {
-    const serverApiURL = `${webManager.getApiUrl()}/backend-manager`;
+    const serverApiURL = `${webManager.getApiUrl()}/backend-manager/user/token`;
 
     const response = await authorizedFetch(serverApiURL, {
       method: 'POST',
       timeout: 60000,
       response: 'json',
       tries: 2,
-      body: {
-        command: 'user:create-custom-token',
-        payload: {},
-      },
     });
 
     // Extract token from response