@kaikybrofc/omnizap-system 2.2.3 → 2.2.4

package/app/modules/stickerPackModule/stickerPackCommandHandlers.js

@@ -161,6 +161,23 @@ const formatVisibilityLabel = (visibility) => {
   return '🔒 Privado';
 };
 
+/**
+ * Detecta packs automáticos para ocultar em listagens do usuário.
+ *
+ * @param {object|null|undefined} pack Pack retornado pelo serviço.
+ * @returns {boolean} Verdadeiro quando o pack é automático.
+ */
+const isAutomaticPack = (pack) => {
+  if (!pack || typeof pack !== 'object') return false;
+  if (pack.is_auto_pack === true || Number(pack.is_auto_pack || 0) === 1) return true;
+
+  const name = String(pack.name || '').trim();
+  if (/^\[auto\]/i.test(name)) return true;
+
+  const description = String(pack.description || '').toLowerCase();
+  return description.includes('[auto-theme:') || description.includes('[auto-tag:');
+};
+
 /**
  * Monta mensagem visual padronizada para comandos de pack.
  *
@@ -683,13 +700,14 @@ export async function handlePackCommand({
 
       case 'list': {
         const packs = await stickerPackService.listPacks({ ownerJid, limit: 100 });
+        const manualPacks = packs.filter((pack) => !isAutomaticPack(pack));
 
         await sendReply({
           sock,
           remoteJid,
           messageInfo,
           expirationMessage,
-          text: formatPackList(packs, commandPrefix),
+          text: formatPackList(manualPacks, commandPrefix),
         });
         return;
       }

package/app/services/lidMapService.js

@@ -344,7 +344,10 @@ export const extractSenderInfoFromMessage = (msg) => {
   } else {
     if (isWhatsAppJid(remoteJid)) jid = remoteJid;
     if (!jid && isWhatsAppJid(participant)) jid = participant;
+    if (!jid && isWhatsAppJid(participantAlt)) jid = participantAlt;
     if (isLidJid(participant)) lid = participant;
+    if (!lid && isLidJid(remoteJid)) lid = remoteJid;
+    if (!lid && isLidJid(participantAlt)) lid = participantAlt;
   }
 
   return { lid, jid, participantAlt, remoteJid, groupMessage };
@@ -541,7 +544,7 @@ export const extractUserIdInfo = (value) => {
   const participantAlt = typeof value.participantAlt === 'string' ? value.participantAlt : null;
   const participant = typeof value.participant === 'string' ? value.participant : null;
   const jidCandidate = value.jid || value.id || participantAlt || participant || null;
-  const lidCandidate = value.lid || participant || null;
+  const lidCandidate = value.lid || participant || participantAlt || value.id || value.jid || null;
 
   return {
     lid: pickLid(lidCandidate, participantAlt, participant),

package/app/services/whatsappLoginLinkService.js

@@ -0,0 +1,232 @@
+import { createHmac, timingSafeEqual } from 'node:crypto';
+import { URL } from 'node:url';
+import { getJidServer, getJidUser, normalizeJid } from '../config/baileysConfig.js';
+
+const WHATSAPP_USER_SERVERS = new Set(['s.whatsapp.net', 'c.us', 'hosted']);
+const DEFAULT_LOGIN_BASE_URL = 'https://omnizap.shop';
+const SIGNING_SECRET = String(process.env.WHATSAPP_LOGIN_LINK_SECRET || '').trim();
+const SIGNED_LINKS_ENABLED = Boolean(SIGNING_SECRET);
+const REQUIRE_SIGNATURE = parseEnvBool(process.env.WHATSAPP_LOGIN_REQUIRE_SIGNATURE, SIGNED_LINKS_ENABLED);
+const LOGIN_TTL_SECONDS = Math.max(60, Number(process.env.WHATSAPP_LOGIN_LINK_TTL_SECONDS) || 15 * 60);
+const LOGIN_PATH = normalizeLoginPath(process.env.WHATSAPP_LOGIN_PATH || '/login/');
+
+function parseEnvBool(value, fallback) {
+  if (value === undefined || value === null || value === '') return fallback;
+  const normalized = String(value).trim().toLowerCase();
+  if (['1', 'true', 'yes', 'y', 'on'].includes(normalized)) return true;
+  if (['0', 'false', 'no', 'n', 'off'].includes(normalized)) return false;
+  return fallback;
+}
+
+function normalizePhoneDigits(value) {
+  return String(value || '').replace(/\D+/g, '');
+}
+
+function normalizeLoginPath(value) {
+  const raw = String(value || '').trim();
+  if (!raw) return '/login/';
+  const withLeadingSlash = raw.startsWith('/') ? raw : `/${raw}`;
+  return withLeadingSlash.endsWith('/') ? withLeadingSlash : `${withLeadingSlash}/`;
+}
+
+function sanitizeTimestamp(value) {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed <= 0) return 0;
+  return Math.floor(parsed);
+}
+
+function buildSignaturePayload(phoneDigits, tsSeconds) {
+  return `${phoneDigits}.${tsSeconds}`;
+}
+
+function buildHintSignature(phoneDigits, tsSeconds) {
+  if (!SIGNED_LINKS_ENABLED) return '';
+  return createHmac('sha256', SIGNING_SECRET).update(buildSignaturePayload(phoneDigits, tsSeconds)).digest('hex');
+}
+
+function safeHexCompare(left, right) {
+  const leftHex = String(left || '').trim().toLowerCase();
+  const rightHex = String(right || '').trim().toLowerCase();
+  if (!leftHex || !rightHex || leftHex.length !== rightHex.length) return false;
+
+  try {
+    const leftBuffer = Buffer.from(leftHex, 'hex');
+    const rightBuffer = Buffer.from(rightHex, 'hex');
+    if (!leftBuffer.length || leftBuffer.length !== rightBuffer.length) return false;
+    return timingSafeEqual(leftBuffer, rightBuffer);
+  } catch {
+    return false;
+  }
+}
+
+function resolveLoginBaseUrl(explicitBaseUrl = '') {
+  const candidates = [
+    explicitBaseUrl,
+    process.env.WHATSAPP_LOGIN_BASE_URL,
+    process.env.SITE_ORIGIN,
+    process.env.PUBLIC_WEB_BASE_URL,
+    DEFAULT_LOGIN_BASE_URL,
+  ];
+
+  for (const candidate of candidates) {
+    const raw = String(candidate || '').trim();
+    if (!raw) continue;
+    try {
+      const url = new URL(raw);
+      return `${url.origin}`;
+    } catch (error) {
+      void error;
+    }
+  }
+
+  return DEFAULT_LOGIN_BASE_URL;
+}
+
+export const toWhatsAppPhoneDigits = (value) => {
+  const raw = String(value || '').trim();
+  if (!raw) return '';
+
+  if (raw.includes('@')) {
+    const normalizedJid = normalizeJid(raw);
+    const server = getJidServer(normalizedJid);
+    if (!WHATSAPP_USER_SERVERS.has(server)) return '';
+    const jidUser = String(getJidUser(normalizedJid) || '').split(':')[0];
+    const digits = normalizePhoneDigits(jidUser);
+    return digits.length >= 10 && digits.length <= 15 ? digits : '';
+  }
+
+  const digits = normalizePhoneDigits(raw);
+  return digits.length >= 10 && digits.length <= 15 ? digits : '';
+};
+
+export const toWhatsAppOwnerJid = (value) => {
+  const digits = toWhatsAppPhoneDigits(value);
+  if (!digits) return '';
+  return normalizeJid(`${digits}@s.whatsapp.net`) || '';
+};
+
+export const buildWhatsAppLoginHint = (value, { nowMs = Date.now() } = {}) => {
+  const phoneDigits = toWhatsAppPhoneDigits(value);
+  if (!phoneDigits) return null;
+
+  const tsSeconds = Math.floor(nowMs / 1000);
+  const hint = {
+    wa: phoneDigits,
+    wa_ts: String(tsSeconds),
+  };
+
+  const signature = buildHintSignature(phoneDigits, tsSeconds);
+  if (signature) hint.wa_sig = signature;
+
+  return hint;
+};
+
+export const buildWhatsAppGoogleLoginUrl = ({ userId, baseUrl } = {}) => {
+  const hint = buildWhatsAppLoginHint(userId);
+  if (!hint) return '';
+
+  const root = resolveLoginBaseUrl(baseUrl);
+  const url = new URL(LOGIN_PATH, root);
+  url.searchParams.set('wa', hint.wa);
+  url.searchParams.set('wa_ts', hint.wa_ts);
+  if (hint.wa_sig) url.searchParams.set('wa_sig', hint.wa_sig);
+  return url.toString();
+};
+
+export const extractWhatsAppLoginHint = (payload = {}) => {
+  const source = payload && typeof payload === 'object' ? payload : {};
+  const nested = source.whatsapp_login && typeof source.whatsapp_login === 'object' ? source.whatsapp_login : {};
+  return {
+    wa: String(source.wa ?? source.whatsapp_phone ?? source.owner_phone ?? nested.wa ?? nested.phone ?? '').trim(),
+    wa_ts: String(source.wa_ts ?? source.whatsapp_ts ?? source.owner_phone_ts ?? nested.wa_ts ?? nested.ts ?? '').trim(),
+    wa_sig: String(source.wa_sig ?? source.whatsapp_sig ?? source.owner_phone_sig ?? nested.wa_sig ?? nested.sig ?? '').trim(),
+  };
+};
+
+export const resolveWhatsAppOwnerJidFromLoginPayload = (payload, { nowMs = Date.now() } = {}) => {
+  const hint = extractWhatsAppLoginHint(payload);
+  const hasPayload = Boolean(hint.wa || hint.wa_ts || hint.wa_sig);
+  if (!hasPayload) {
+    return {
+      hasPayload: false,
+      ownerJid: '',
+      verified: false,
+      signed: false,
+      reason: '',
+    };
+  }
+
+  const phoneDigits = toWhatsAppPhoneDigits(hint.wa);
+  const ownerJid = toWhatsAppOwnerJid(phoneDigits);
+  if (!ownerJid) {
+    return {
+      hasPayload: true,
+      ownerJid: '',
+      verified: false,
+      signed: false,
+      reason: 'invalid_phone',
+    };
+  }
+
+  if (!SIGNED_LINKS_ENABLED) {
+    return {
+      hasPayload: true,
+      ownerJid,
+      verified: false,
+      signed: false,
+      reason: '',
+    };
+  }
+
+  const tsSeconds = sanitizeTimestamp(hint.wa_ts);
+  const hasSignature = Boolean(hint.wa_sig);
+
+  if (!tsSeconds || !hasSignature) {
+    if (REQUIRE_SIGNATURE) {
+      return {
+        hasPayload: true,
+        ownerJid: '',
+        verified: false,
+        signed: false,
+        reason: 'missing_signature',
+      };
+    }
+    return {
+      hasPayload: true,
+      ownerJid,
+      verified: false,
+      signed: false,
+      reason: '',
+    };
+  }
+
+  const nowSeconds = Math.floor(nowMs / 1000);
+  if (Math.abs(nowSeconds - tsSeconds) > LOGIN_TTL_SECONDS) {
+    return {
+      hasPayload: true,
+      ownerJid: '',
+      verified: false,
+      signed: true,
+      reason: 'expired',
+    };
+  }
+
+  const expectedSignature = buildHintSignature(phoneDigits, tsSeconds);
+  if (!safeHexCompare(expectedSignature, hint.wa_sig)) {
+    return {
+      hasPayload: true,
+      ownerJid: '',
+      verified: false,
+      signed: true,
+      reason: 'invalid_signature',
+    };
+  }
+
+  return {
+    hasPayload: true,
+    ownerJid,
+    verified: true,
+    signed: true,
+    reason: '',
+  };
+};

package/database/migrations/20260228_0021_sticker_web_google_owner_phone.sql

@@ -0,0 +1,83 @@
+SET @db_name = DATABASE();
+
+SET @has_user_owner_phone := (
+  SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE TABLE_SCHEMA = @db_name
+    AND TABLE_NAME = 'sticker_web_google_user'
+    AND COLUMN_NAME = 'owner_phone'
+);
+SET @sql_user_owner_phone := IF(
+  @has_user_owner_phone = 0,
+  'ALTER TABLE sticker_web_google_user ADD COLUMN owner_phone VARCHAR(20) NULL AFTER owner_jid',
+  'SELECT 1'
+);
+PREPARE stmt_user_owner_phone FROM @sql_user_owner_phone;
+EXECUTE stmt_user_owner_phone;
+DEALLOCATE PREPARE stmt_user_owner_phone;
+
+SET @has_user_owner_phone_idx := (
+  SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.STATISTICS
+  WHERE TABLE_SCHEMA = @db_name
+    AND TABLE_NAME = 'sticker_web_google_user'
+    AND INDEX_NAME = 'idx_sticker_web_google_user_owner_phone'
+);
+SET @sql_user_owner_phone_idx := IF(
+  @has_user_owner_phone_idx = 0,
+  'ALTER TABLE sticker_web_google_user ADD INDEX idx_sticker_web_google_user_owner_phone (owner_phone)',
+  'SELECT 1'
+);
+PREPARE stmt_user_owner_phone_idx FROM @sql_user_owner_phone_idx;
+EXECUTE stmt_user_owner_phone_idx;
+DEALLOCATE PREPARE stmt_user_owner_phone_idx;
+
+SET @has_session_owner_phone := (
+  SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE TABLE_SCHEMA = @db_name
+    AND TABLE_NAME = 'sticker_web_google_session'
+    AND COLUMN_NAME = 'owner_phone'
+);
+SET @sql_session_owner_phone := IF(
+  @has_session_owner_phone = 0,
+  'ALTER TABLE sticker_web_google_session ADD COLUMN owner_phone VARCHAR(20) NULL AFTER owner_jid',
+  'SELECT 1'
+);
+PREPARE stmt_session_owner_phone FROM @sql_session_owner_phone;
+EXECUTE stmt_session_owner_phone;
+DEALLOCATE PREPARE stmt_session_owner_phone;
+
+SET @has_session_owner_phone_idx := (
+  SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.STATISTICS
+  WHERE TABLE_SCHEMA = @db_name
+    AND TABLE_NAME = 'sticker_web_google_session'
+    AND INDEX_NAME = 'idx_sticker_web_google_session_owner_phone'
+);
+SET @sql_session_owner_phone_idx := IF(
+  @has_session_owner_phone_idx = 0,
+  'ALTER TABLE sticker_web_google_session ADD INDEX idx_sticker_web_google_session_owner_phone (owner_phone)',
+  'SELECT 1'
+);
+PREPARE stmt_session_owner_phone_idx FROM @sql_session_owner_phone_idx;
+EXECUTE stmt_session_owner_phone_idx;
+DEALLOCATE PREPARE stmt_session_owner_phone_idx;
+
+UPDATE sticker_web_google_user
+SET owner_phone = CASE
+  WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(owner_jid, '@', 1), ':', 1) REGEXP '^[0-9]{10,20}$'
+    THEN SUBSTRING_INDEX(SUBSTRING_INDEX(owner_jid, '@', 1), ':', 1)
+  ELSE NULL
+END
+WHERE (owner_phone IS NULL OR owner_phone = '')
+  AND owner_jid IS NOT NULL;
+
+UPDATE sticker_web_google_session
+SET owner_phone = CASE
+  WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(owner_jid, '@', 1), ':', 1) REGEXP '^[0-9]{10,20}$'
+    THEN SUBSTRING_INDEX(SUBSTRING_INDEX(owner_jid, '@', 1), ':', 1)
+  ELSE NULL
+END
+WHERE (owner_phone IS NULL OR owner_phone = '')
+  AND owner_jid IS NOT NULL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaikybrofc/omnizap-system",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Sistema profissional de automação WhatsApp com tecnologia Baileys",
   "main": "index.js",
   "publishConfig": {

package/public/index.html

@@ -138,8 +138,63 @@
 
     .nav { display: flex; gap: 10px; flex-wrap: wrap; }
 
-    .nav-toggle {
-      display: none;
+      .nav-user-chip {
+        display: inline-flex;
+        align-items: center;
+        gap: 8px;
+      padding: 6px 10px 6px 6px;
+      max-width: 270px;
+      border-color: #3f5f8f;
+      background: linear-gradient(120deg, #132544d6, #10203ad6);
+    }
+
+    .nav-user-avatar-bubble {
+      display: inline-flex;
+      width: 30px;
+      height: 30px;
+      border-radius: 999px;
+      border: 1px solid #4a6fa4;
+      background: #132340;
+      box-shadow: 0 0 0 2px #1a2e4b, 0 0 16px #6aaaf236;
+      overflow: hidden;
+      flex: 0 0 auto;
+    }
+
+    .nav-user-photo {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      display: block;
+    }
+
+    .nav-user-name-bubble {
+      display: inline-flex;
+      align-items: center;
+      gap: 6px;
+      min-width: 0;
+      padding: 4px 8px;
+      border-radius: 999px;
+      border: 1px solid #34547f;
+      background: #12213ac9;
+    }
+
+    .nav-user-icon {
+      font-size: 12px;
+      color: #9bc6f5;
+      flex: 0 0 auto;
+    }
+
+      .nav-user-name {
+        font-size: 12px;
+        font-weight: 700;
+        color: #dbe8fb;
+        white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+      .nav-toggle {
+        display: none;
       width: 42px;
       height: 42px;
       border-radius: 10px;
@@ -178,12 +233,12 @@
 
     .btn:hover { transform: translateY(-1px); border-color: #3f567f; }
 
-    .btn.primary {
-      color: #042511;
-      border-color: transparent;
-      background: linear-gradient(90deg, var(--primary), #16a34a);
-      box-shadow: 0 8px 22px #22c55e33;
-    }
+      .btn.primary {
+        color: #042511;
+        border-color: transparent;
+        background: linear-gradient(90deg, var(--primary), #16a34a);
+        box-shadow: 0 8px 22px #22c55e33;
+      }
 
     @media (max-width: 860px) {
       .top-inner {
@@ -228,6 +283,38 @@
         border-radius: 10px;
       }
 
+      .nav-user-chip {
+        justify-content: flex-start;
+      }
+
+      body.home-authenticated #main-nav #nav-auth-link.nav-user-chip {
+        width: 44px;
+        min-width: 44px;
+        max-width: 44px;
+        height: 44px;
+        padding: 4px;
+        border-radius: 999px;
+        justify-content: center;
+        justify-self: center;
+        align-self: center;
+        background: linear-gradient(120deg, #132544f0, #10203af0);
+      }
+
+      body.home-authenticated #main-nav #nav-auth-link.nav-user-chip .nav-user-name-bubble {
+        display: none;
+      }
+
+      body.home-authenticated #main-nav #nav-auth-link.nav-user-chip .nav-user-avatar-bubble {
+        width: 34px;
+        height: 34px;
+        border: 1px solid #4a6fa4;
+        box-shadow: 0 0 0 1px #1a2e4b, 0 0 12px #6aaaf236;
+      }
+
+      body.home-authenticated #main-nav #nav-scheduler-link {
+        display: none;
+      }
+
     }
 
     @media (max-width: 420px) {
@@ -1057,7 +1144,8 @@
         >☰</button>
       </div>
       <nav id="main-nav" class="nav">
-        <a class="btn" href="/api-docs/"><i class="fa-solid fa-code icon-inline" aria-hidden="true"></i>API</a>
+        <a id="nav-scheduler-link" class="btn" href="/api-docs/"><i class="fa-solid fa-code icon-inline" aria-hidden="true"></i>API</a>
+        <a id="nav-auth-link" class="btn" href="/login/"><i class="fa-solid fa-right-to-bracket icon-inline" aria-hidden="true"></i>Login</a>
         <a class="btn" href="https://github.com/Kaikygr/omnizap-system" target="_blank" rel="noreferrer noopener"><i class="fa-brands fa-github icon-inline" aria-hidden="true"></i>GitHub</a>
       </nav>
     </div>
@@ -1072,6 +1160,8 @@
       <div class="hero-cta">
         <a class="btn primary" href="https://github.com/Kaikygr/omnizap-system" target="_blank" rel="noreferrer noopener"><i class="fa-brands fa-github icon-inline" aria-hidden="true"></i>Ver no GitHub</a>
         <a class="btn" href="/api-docs/"><i class="fa-solid fa-book icon-inline" aria-hidden="true"></i>Documentação da API</a>
+        <a id="hero-login-cta" class="btn" href="/login/"><i class="fa-solid fa-right-to-bracket icon-inline" aria-hidden="true"></i>Login</a>
+        <a class="btn" href="/stickers/"><i class="fa-solid fa-icons icon-inline" aria-hidden="true"></i>Ir para Stickers</a>
         <a class="btn" href="#infra-arquitetura"><i class="fa-solid fa-diagram-project icon-inline" aria-hidden="true"></i>Ver Arquitetura</a>
       </div>
       <section class="hero-proof">
@@ -1269,6 +1359,7 @@ curl -sS https://omnizap.shop/api/sticker-packs/system-summary | jq</code></pre>
       <div class="foot-col">
         <h4><i class="fa-solid fa-cube icon-inline" aria-hidden="true"></i>Produto</h4>
         <a href="/"><i class="fa-solid fa-house icon-inline" aria-hidden="true"></i>Home</a>
+        <a href="/login/"><i class="fa-solid fa-right-to-bracket icon-inline" aria-hidden="true"></i>Login</a>
         <a href="/stickers/"><i class="fa-solid fa-icons icon-inline" aria-hidden="true"></i>Stickers</a>
         <a href="/stickers/create/"><i class="fa-solid fa-plus icon-inline" aria-hidden="true"></i>Criar Pack</a>
         <a href="/api-docs/"><i class="fa-solid fa-book icon-inline" aria-hidden="true"></i>API Docs</a>
@@ -1305,7 +1396,7 @@ curl -sS https://omnizap.shop/api/sticker-packs/system-summary | jq</code></pre>
   ><i class="fa-brands fa-whatsapp" aria-hidden="true"></i></a>
 
   <div id="home-react-root" hidden></div>
-  <script type="module" src="/js/apps/homeApp.js?v=20260227c"></script>
+  <script type="module" src="/js/apps/homeApp.js?v=20260228-mobile-user-bubble2"></script>
   <script type="module" src="/js/github-panel/index.js?v=20260226a"></script>
 </body>
 </html>