@kaikybrofc/omnizap-system 2.3.2 → 2.3.3

package/public/js/apps/loginApp.js

@@ -6,17 +6,18 @@ const LOGIN_CONSENT_STORAGE_KEY = 'omnizap_login_terms_consent_v1';
 const LOGIN_CONSENT_HINT = 'Aceite os Termos de Uso e a Politica de Privacidade para continuar.';
 const DEFAULT_SUCCESS_CHAT_LABEL = 'Abrir WhatsApp do bot';
 const DEFAULT_SUCCESS_HOME_LABEL = 'Ir para o painel';
-const ALREADY_LOGGED_STATUS_TEXT = 'Voce ja esta logado neste navegador.';
 const ALREADY_LOGGED_HINT_TEXT = 'Nao e necessario fazer login novamente. Escolha uma opcao abaixo.';
 
 const root = document.getElementById('login-app-root');
 
 if (root) {
   const ui = {
+    loginCard: document.getElementById('login-main-card'),
     status: document.getElementById('login-status'),
     hint: document.getElementById('login-hint'),
     error: document.getElementById('login-error'),
     googleArea: document.getElementById('google-login-area'),
+    googleButtonShell: document.getElementById('google-login-button-shell'),
     googleButton: document.querySelector('[data-google-login-button]'),
     googleState: document.getElementById('google-login-state'),
     consentBox: document.getElementById('login-consent-box'),
@@ -59,6 +60,25 @@ if (root) {
     element.textContent = String(value || '');
   };
 
+  const isAuthenticatedFlagEnabled = (value) => {
+    if (value === true || value === 1) return true;
+    if (typeof value === 'string') {
+      const normalized = value.trim().toLowerCase();
+      return normalized === 'true' || normalized === '1';
+    }
+    return false;
+  };
+
+  const isAuthenticatedGoogleSession = (sessionData) => {
+    if (!sessionData || typeof sessionData !== 'object') return false;
+    if (!isAuthenticatedFlagEnabled(sessionData.authenticated)) return false;
+    const provider = String(sessionData.provider || '').trim().toLowerCase();
+    if (provider && provider !== 'google') return false;
+    const ownerJid = String(sessionData.owner_jid || '').trim();
+    const userSub = String(sessionData?.user?.sub || '').trim();
+    return Boolean(ownerJid || userSub);
+  };
+
   const normalizeDigits = (value) => String(value || '').replace(/\D+/g, '');
 
   const showError = (message) => {
@@ -82,7 +102,9 @@ if (root) {
       } else {
         window.localStorage.removeItem(LOGIN_CONSENT_STORAGE_KEY);
       }
-    } catch {}
+    } catch {
+      // Ignore storage errors (private mode or blocked storage).
+    }
   };
 
   const readConsentState = () => {
@@ -131,6 +153,47 @@ if (root) {
     setText(ui.googleState, state.busy ? 'Finalizando login...' : state.consentAccepted ? (state.googleReady ? '' : 'Carregando login Google...') : LOGIN_CONSENT_HINT);
   };
 
+  const renderGoogleLoginControls = () => {
+    const hideLoginControls = state.authenticated;
+    if (ui.consentBox) {
+      ui.consentBox.hidden = hideLoginControls;
+    }
+    if (ui.googleButtonShell) {
+      ui.googleButtonShell.hidden = hideLoginControls || !state.consentAccepted;
+    }
+  };
+
+  const renderLoginCardVisibility = () => {
+    if (!ui.loginCard) return;
+    ui.loginCard.hidden = Boolean(state.authenticated);
+  };
+
+  const resolveGoogleButtonWidth = () => {
+    const directWidth = Math.floor(Number(ui.googleButton?.clientWidth || 0));
+    if (directWidth > 0) {
+      return Math.max(180, Math.min(320, directWidth));
+    }
+
+    const areaWidth = Math.floor(Number(ui.googleArea?.clientWidth || 0));
+    if (areaWidth > 0) {
+      const areaStyles = ui.googleArea ? window.getComputedStyle(ui.googleArea) : null;
+      const shellStyles = ui.googleButtonShell ? window.getComputedStyle(ui.googleButtonShell) : null;
+      const areaPaddingX = areaStyles ? Number.parseFloat(areaStyles.paddingLeft || '0') + Number.parseFloat(areaStyles.paddingRight || '0') : 0;
+      const shellPaddingX = shellStyles ? Number.parseFloat(shellStyles.paddingLeft || '0') + Number.parseFloat(shellStyles.paddingRight || '0') : 16;
+      const shellBorderX = shellStyles ? Number.parseFloat(shellStyles.borderLeftWidth || '0') + Number.parseFloat(shellStyles.borderRightWidth || '0') : 2;
+      const available = Math.floor(areaWidth - areaPaddingX - shellPaddingX - shellBorderX);
+      if (available > 0) {
+        return Math.max(180, Math.min(320, available));
+      }
+    }
+
+    const viewportAvailable = Math.floor(Number(window.innerWidth || 0)) - 96;
+    if (viewportAvailable > 0) {
+      return Math.max(180, Math.min(320, viewportAvailable));
+    }
+    return 280;
+  };
+
   const formatPhone = (digits) => {
     const value = normalizeDigits(digits);
     if (!value) return '';
@@ -174,7 +237,7 @@ if (root) {
 
   const renderSuccessActions = (sessionData, options = {}) => {
     if (!ui.successActions) return;
-    const authenticated = Boolean(sessionData?.authenticated);
+    const authenticated = isAuthenticatedFlagEnabled(sessionData?.authenticated);
     ui.successActions.hidden = !authenticated;
     if (!authenticated) return;
 
@@ -209,28 +272,10 @@ if (root) {
     state.authenticated = true;
     state.sessionOwnerPhone = ownerPhone;
 
-    setText(ui.status, ALREADY_LOGGED_STATUS_TEXT);
-    if (ownerPhone) {
-      setText(ui.hint, `Sessao ativa para +${formatPhone(ownerPhone)}.`);
-    } else {
-      setText(ui.hint, ALREADY_LOGGED_HINT_TEXT);
-    }
-
     showError('');
     showConsentError('');
-    renderAlreadyLoggedBanner({ visible: true, ownerPhone });
     hideSuccessCelebration();
-    if (ui.googleArea) ui.googleArea.hidden = true;
-    if (ui.summary) ui.summary.hidden = true;
-    if (ui.whatsappCta) ui.whatsappCta.hidden = true;
-    renderSuccessActions(
-      { authenticated: true },
-      {
-        chatLabel: 'Abrir WPP no bot',
-        homeLabel: 'Voltar para tela inicial',
-        homeHref: '/',
-      },
-    );
+    renderSessionSummary(sessionData);
   };
 
   const renderWhatsAppCta = () => {
@@ -280,14 +325,18 @@ if (root) {
     if (!canUseGoogleLogin()) {
       state.authenticated = false;
       state.sessionOwnerPhone = '';
+      renderGoogleLoginControls();
+      renderLoginCardVisibility();
       if (ui.summary) ui.summary.hidden = true;
       renderSuccessActions(null);
       renderWhatsAppCta();
       return;
     }
 
-    const authenticated = Boolean(sessionData?.authenticated);
+    const authenticated = isAuthenticatedGoogleSession(sessionData);
     state.authenticated = authenticated;
+    renderGoogleLoginControls();
+    renderLoginCardVisibility();
     renderSuccessActions(sessionData);
     if (ui.summary) ui.summary.hidden = !authenticated;
     if (!authenticated) {
@@ -364,6 +413,7 @@ if (root) {
     if (state.consentAccepted) {
       showConsentError('');
     }
+    renderGoogleLoginControls();
     setBusy(state.busy);
   };
 
@@ -391,7 +441,7 @@ if (root) {
         body: JSON.stringify(buildSessionPayload(token)),
       });
       const sessionData = sessionPayload?.data || {};
-      if (!sessionData?.authenticated) {
+      if (!isAuthenticatedGoogleSession(sessionData)) {
         throw new Error('Nao foi possivel criar a sessao Google.');
       }
       setText(ui.status, 'Conta Google detectada');
@@ -454,8 +504,7 @@ if (root) {
       });
 
       ui.googleButton.innerHTML = '';
-      const measuredWidth = Math.floor(Number(ui.googleButton.clientWidth || 0));
-      const buttonWidth = Math.max(180, Math.min(320, measuredWidth || 320));
+      const buttonWidth = resolveGoogleButtonWidth();
       accounts.renderButton(ui.googleButton, {
         type: 'standard',
         theme: 'outline',
@@ -529,7 +578,7 @@ if (root) {
     try {
       const payload = await fetchJson(sessionApiPath, { method: 'GET' });
       const sessionData = payload?.data || {};
-      if (sessionData?.authenticated) {
+      if (isAuthenticatedGoogleSession(sessionData)) {
         renderAlreadyLoggedInState(sessionData);
         return true;
       }
@@ -554,6 +603,7 @@ if (root) {
     if (ui.googleArea) {
       ui.googleArea.hidden = !allowed;
     }
+    renderGoogleLoginControls();
     if (!allowed) {
       renderAlreadyLoggedBanner({ visible: false });
     }
@@ -568,6 +618,7 @@ if (root) {
   };
 
   const init = async () => {
+    renderAlreadyLoggedBanner({ visible: false });
     if (ui.consentCheckbox) {
       ui.consentCheckbox.checked = readConsentState();
       ui.consentCheckbox.addEventListener('change', syncConsentState);
@@ -581,8 +632,12 @@ if (root) {
     renderSuccessActions(null);
     const allowGoogleLogin = renderGoogleLoginGate();
     await loadBotPhone();
+    if (!allowGoogleLogin) {
+      renderSessionSummary(null);
+      return;
+    }
     const alreadyLogged = await loadCurrentSession();
-    if (alreadyLogged || !allowGoogleLogin) return;
+    if (alreadyLogged) return;
     await loadConfig();
     await mountGoogleButton();
   };

package/public/js/apps/stickersAdminApp.js

@@ -188,7 +188,7 @@ function loadScript(src) {
 
 async function fetchJson(url, options = {}) {
   const response = await fetch(url, {
-    credentials: 'same-origin',
+    credentials: 'include',
     ...options,
   });
 

package/public/js/apps/stickersApp.js

@@ -2293,7 +2293,7 @@ function StickersApp() {
     let attempt = 0;
     while (true) {
       try {
-        const response = await fetch(url, { credentials: 'same-origin', ...opts });
+        const response = await fetch(url, { credentials: 'include', ...opts });
         const rawText = await response.text().catch(() => '');
         let payload = {};
         if (rawText) {

package/public/js/apps/userApp.js

@@ -640,10 +640,7 @@ if (root) {
       const severity = normalizeString(event?.severity) || 'low';
       const badgeLabel = severity.toUpperCase();
       const createdAt = formatDateTime(event?.created_at || event?.revoked_at);
-      const meta = [
-        normalizeString(event?.subtitle),
-        `Tipo: ${normalizeString(event?.event_type) || 'evento'} • ${createdAt}`,
-      ];
+      const meta = [normalizeString(event?.subtitle), `Tipo: ${normalizeString(event?.event_type) || 'evento'} • ${createdAt}`];
 
       if (normalizeString(event?.reason)) meta.push(`Motivo: ${normalizeString(event.reason)}`);
 
@@ -691,11 +688,7 @@ if (root) {
     for (const session of list) {
       const identity = compactIdentityPayload(session);
       const title = normalizeString(session?.name || session?.email || session?.owner_jid || 'Sessão ativa');
-      const meta = [
-        `Email: ${normalizeString(session?.email) || 'n/d'}`,
-        `Owner: ${normalizeString(session?.owner_jid) || 'n/d'}`,
-        `Último acesso: ${formatDateTime(session?.last_seen_at)} • Expira: ${formatDateTime(session?.expires_at)}`,
-      ];
+      const meta = [`Email: ${normalizeString(session?.email) || 'n/d'}`, `Owner: ${normalizeString(session?.owner_jid) || 'n/d'}`, `Último acesso: ${formatDateTime(session?.last_seen_at)} • Expira: ${formatDateTime(session?.expires_at)}`];
       const actions = [];
       if (Object.keys(identity).length) {
         actions.push(createMiniButton('Forçar logout', () => handleAdminForceLogout(identity, buildIdentityLabel(identity))));
@@ -723,11 +716,7 @@ if (root) {
     for (const user of list) {
       const identity = buildForceLogoutPayloadFromAny(user);
       const title = normalizeString(user?.name || user?.email || user?.owner_jid || 'Usuário');
-      const meta = [
-        `Email: ${normalizeString(user?.email) || 'n/d'}`,
-        `Owner: ${normalizeString(user?.owner_jid) || 'n/d'}`,
-        `Último login: ${formatDateTime(user?.last_login_at)} • Último acesso: ${formatDateTime(user?.last_seen_at)}`,
-      ];
+      const meta = [`Email: ${normalizeString(user?.email) || 'n/d'}`, `Owner: ${normalizeString(user?.owner_jid) || 'n/d'}`, `Último login: ${formatDateTime(user?.last_login_at)} • Último acesso: ${formatDateTime(user?.last_seen_at)}`];
       const actions = [];
       if (Object.keys(identity).length) {
         actions.push(createMiniButton('Forçar logout', () => handleAdminForceLogout(identity, buildIdentityLabel(identity))));
@@ -755,10 +744,7 @@ if (root) {
     for (const ban of list) {
       const identity = normalizeString(ban?.email || ban?.owner_jid || ban?.google_sub || `ban:${ban?.id || ''}`);
       const isRevoked = Boolean(ban?.revoked_at);
-      const meta = [
-        `Criado: ${formatDateTime(ban?.created_at)}${isRevoked ? ` • Revogado: ${formatDateTime(ban?.revoked_at)}` : ''}`,
-        `Motivo: ${normalizeString(ban?.reason) || 'não informado'}`,
-      ];
+      const meta = [`Criado: ${formatDateTime(ban?.created_at)}${isRevoked ? ` • Revogado: ${formatDateTime(ban?.revoked_at)}` : ''}`, `Motivo: ${normalizeString(ban?.reason) || 'não informado'}`];
       const actions = [];
       if (!isRevoked && normalizeString(ban?.id)) {
         actions.push(createMiniButton('Revogar ban', () => handleAdminBanRevoke(ban.id)));
@@ -791,10 +777,7 @@ if (root) {
       const details = isObject(item?.details) ? Object.entries(item.details).slice(0, 3) : [];
       const detailLine = details.length ? `Detalhes: ${details.map(([key, value]) => `${key}=${value}`).join(' • ')}` : '';
 
-      const meta = [
-        `Admin: ${normalizeString(item?.admin_email || item?.admin_google_sub || item?.admin_owner_jid || 'n/d')} (${formatAdminRole(normalizeString(item?.admin_role || 'admin'))})`,
-        `Alvo: ${targetType}${targetId ? ` / ${targetId}` : ''} • Em: ${formatDateTime(item?.created_at)}`,
-      ];
+      const meta = [`Admin: ${normalizeString(item?.admin_email || item?.admin_google_sub || item?.admin_owner_jid || 'n/d')} (${formatAdminRole(normalizeString(item?.admin_role || 'admin'))})`, `Alvo: ${targetType}${targetId ? ` / ${targetId}` : ''} • Em: ${formatDateTime(item?.created_at)}`];
       if (detailLine) meta.push(detailLine);
 
       appendListItem({
@@ -868,11 +851,7 @@ if (root) {
         title: flagName || 'feature_flag',
         severity: isEnabled ? 'low' : 'medium',
         badgeLabel: isEnabled ? 'ON' : 'OFF',
-        meta: [
-          `Rollout: ${rollout}%`,
-          description ? `Descrição: ${description}` : 'Descrição: n/d',
-          `Atualizado por: ${updatedBy || 'n/d'} • ${formatDateTime(flag?.updated_at)}`,
-        ],
+        meta: [`Rollout: ${rollout}%`, description ? `Descrição: ${description}` : 'Descrição: n/d', `Atualizado por: ${updatedBy || 'n/d'} • ${formatDateTime(flag?.updated_at)}`],
         actions,
         customNode: rolloutForm,
       });
@@ -891,10 +870,7 @@ if (root) {
     for (const alert of list) {
       const severity = normalizeString(alert?.severity || 'low');
       const title = normalizeString(alert?.title || alert?.code || 'Alerta');
-      const meta = [
-        normalizeString(alert?.message || ''),
-        `Código: ${normalizeString(alert?.code || 'n/d')} • ${formatDateTime(alert?.created_at)}`,
-      ];
+      const meta = [normalizeString(alert?.message || ''), `Código: ${normalizeString(alert?.code || 'n/d')} • ${formatDateTime(alert?.created_at)}`];
       appendListItem({
         container: ui.adminAlertsList,
         title,
@@ -923,12 +899,7 @@ if (root) {
       title: `Resultado para "${q || 'consulta'}"`,
       severity: 'low',
       badgeLabel: 'BUSCA',
-      meta: [
-        `Usuários: ${formatIntegerOrNd(totals.users)}`,
-        `Sessões: ${formatIntegerOrNd(totals.sessions)}`,
-        `Grupos: ${formatIntegerOrNd(totals.groups)}`,
-        `Packs: ${formatIntegerOrNd(totals.packs)}`,
-      ],
+      meta: [`Usuários: ${formatIntegerOrNd(totals.users)}`, `Sessões: ${formatIntegerOrNd(totals.sessions)}`, `Grupos: ${formatIntegerOrNd(totals.groups)}`, `Packs: ${formatIntegerOrNd(totals.packs)}`],
     });
 
     const users = Array.isArray(results.users) ? results.users : [];

package/public/login/index.html

@@ -40,6 +40,10 @@
         box-sizing: border-box;
       }
 
+      [hidden] {
+        display: none !important;
+      }
+
       html,
       body {
         margin: 0;
@@ -50,10 +54,7 @@
       body {
         color: var(--text);
         font-family: 'Manrope', system-ui, sans-serif;
-        background:
-          radial-gradient(56rem 25rem at -8% -16%, #2563eb2f, transparent 62%),
-          radial-gradient(54rem 22rem at 108% -8%, #22c55e1f, transparent 60%),
-          linear-gradient(165deg, var(--bg), var(--bg-2));
+        background: radial-gradient(56rem 25rem at -8% -16%, #2563eb2f, transparent 62%), radial-gradient(54rem 22rem at 108% -8%, #22c55e1f, transparent 60%), linear-gradient(165deg, var(--bg), var(--bg-2));
         min-height: 100vh;
         display: flex;
         align-items: center;
@@ -280,6 +281,7 @@
         border-radius: 14px;
         background: #ffffff;
         padding: 8px;
+        overflow: hidden;
         box-shadow:
           0 8px 18px #02091624,
           inset 0 1px 0 #ffffff;
@@ -297,7 +299,14 @@
 
       [data-google-login-button] {
         width: 100%;
+        max-width: 100%;
         min-height: 44px;
+        overflow: hidden;
+      }
+
+      [data-google-login-button] > div,
+      [data-google-login-button] iframe {
+        max-width: 100% !important;
       }
 
       .google-state {
@@ -595,7 +604,7 @@
         <h1>Acesse sua conta</h1>
         <p class="lead">Vincule seu WhatsApp e libere os recursos do OmniZap.</p>
 
-        <article class="card">
+        <article id="login-main-card" class="card">
           <p id="login-status" class="status">Verificando conta Google...</p>
           <p id="login-hint" class="hint"></p>
           <p id="login-error" class="error" hidden></p>
@@ -605,17 +614,14 @@
           </div>
 
           <div id="google-login-area" class="google-area" hidden>
-            <div class="google-button-shell">
+            <div id="google-login-button-shell" class="google-button-shell" hidden>
               <div data-google-login-button></div>
             </div>
             <p id="google-login-state" class="google-state">Carregando login Google...</p>
             <div id="login-consent-box" class="consent">
               <label class="consent-row" for="login-consent-checkbox">
                 <input id="login-consent-checkbox" type="checkbox" />
-                <span>
-                  Li e aceito os <a href="/termos-de-uso/" target="_blank" rel="noreferrer noopener">Termos de Uso</a> e a
-                  <a href="/termos-de-uso/#politica-de-privacidade" target="_blank" rel="noreferrer noopener">Politica de Privacidade</a>.
-                </span>
+                <span> Li e aceito os <a href="/termos-de-uso/" target="_blank" rel="noreferrer noopener">Termos de Uso</a> e a <a href="/termos-de-uso/#politica-de-privacidade" target="_blank" rel="noreferrer noopener">Politica de Privacidade</a>. </span>
               </label>
               <p id="login-consent-error" class="consent-error" hidden></p>
             </div>
@@ -652,6 +658,6 @@
       </div>
     </div>
 
-    <script type="module" src="/js/apps/loginApp.js?v=20260301d"></script>
+    <script type="module" src="/js/apps/loginApp.js?v=20260301j"></script>
   </body>
 </html>

package/public/user/index.html

@@ -293,7 +293,6 @@
           width: 100%;
           text-align: center;
         }
-
       }
     </style>
   </head>

package/server/controllers/stickerCatalog/nonCatalogHandlers.js

@@ -1,29 +1,4 @@
-export const createStickerCatalogNonCatalogHandlers = ({
-  sendJson,
-  sendText,
-  logger,
-  getSystemSummaryCached,
-  systemSummaryCache,
-  systemSummaryCacheSeconds,
-  getReadmeSummaryCached,
-  readmeSummaryCache,
-  readmeSummaryCacheSeconds,
-  getGlobalRankingSummaryCached,
-  globalRankRefreshSeconds,
-  globalRankCache,
-  sanitizeRankingPayloadByBot,
-  getActiveSocket,
-  resolveBotUserCandidates,
-  getMarketplaceGlobalStatsCached,
-  marketplaceGlobalStatsCacheSeconds,
-  marketplaceGlobalStatsCache,
-  githubRepoInfo,
-  githubToken,
-  githubProjectCacheSeconds,
-  fetchGitHubProjectSummary,
-  buildSupportInfo,
-  buildBotContactInfo,
-}) => {
+export const createStickerCatalogNonCatalogHandlers = ({ sendJson, sendText, logger, getSystemSummaryCached, systemSummaryCache, systemSummaryCacheSeconds, getReadmeSummaryCached, readmeSummaryCache, readmeSummaryCacheSeconds, getGlobalRankingSummaryCached, globalRankRefreshSeconds, globalRankCache, sanitizeRankingPayloadByBot, getActiveSocket, resolveBotUserCandidates, getMarketplaceGlobalStatsCached, marketplaceGlobalStatsCacheSeconds, marketplaceGlobalStatsCache, githubRepoInfo, githubToken, githubProjectCacheSeconds, fetchGitHubProjectSummary, buildSupportInfo, buildBotContactInfo }) => {
   const handleSystemSummaryRequest = async (req, res) => {
     try {
       const payload = await getSystemSummaryCached();