@hed-hog/core 0.0.399 → 0.0.400

package/src/captcha/captcha.service.ts

@@ -21,6 +21,26 @@ export interface CaptchaPublicConfig {
   site_key: string | null;
 }
 
+/**
+ * Contexto da submissao que esta sendo verificada. Tudo opcional: uma superficie
+ * que ainda nao manda `action` continua passando, o que permite subir o backend
+ * antes do front sem derrubar quem esta com bundle antigo em cache.
+ */
+export interface CaptchaVerifyContext {
+  /** IP do visitante (X-Forwarded-For repassado pelo BFF), nao o IP do pod. */
+  remoteIp?: string | null;
+  /** `data-action` que a superficie manda no widget. */
+  expectedAction?: string | null;
+}
+
+/** Resposta do siteverify que nos interessa. Os provedores mandam mais campos. */
+interface SiteverifyResponse {
+  success?: boolean;
+  action?: string;
+  hostname?: string;
+  'error-codes'?: string[];
+}
+
 interface AltchaPayload {
   algorithm: string;
   challenge: string;
@@ -29,6 +49,12 @@ interface AltchaPayload {
   signature: string;
 }
 
+/** Teto do token aceito pelo siteverify; acima disso nem vale a viagem de rede. */
+const MAX_TOKEN_LENGTH = 2048;
+
+/** Timeout da chamada ao provedor: sem ele um provedor lento prende o request. */
+const SITEVERIFY_TIMEOUT_MS = 10_000;
+
 /**
  * Server-side CAPTCHA verification shared by every public form in the platform.
  *
@@ -45,19 +71,36 @@ export class CaptchaService {
   /**
    * Verifies a token against the provider configured in an integration profile.
    * Throws `BadRequestException` when the challenge does not check out.
+   *
+   * The profile can be addressed by numeric id or by slug. Forms and channels
+   * hold a real FK (`captcha_integration_profile_id`), but a setting picked
+   * through the admin's entity-picker stores the profile *slug* — as
+   * `commerce-back-in-stock-captcha-profile-id` does. Accepting both keeps a
+   * profile chosen on screen from silently failing the challenge shut.
    */
   async verifyForProfile(
-    integrationProfileId: number | null | undefined,
+    integrationProfileRef: number | string | null | undefined,
     token: string | null | undefined,
+    context: CaptchaVerifyContext = {},
   ): Promise<void> {
-    if (!integrationProfileId) {
+    const ref =
+      typeof integrationProfileRef === 'string'
+        ? integrationProfileRef.trim()
+        : integrationProfileRef;
+
+    // `'0'` is the legacy default of the settings named `...-profile-id`: it is
+    // nobody's id and nobody's slug.
+    if (!ref || ref === '0') {
       throw new BadRequestException(
         'CAPTCHA is enabled but no integration profile is configured.',
       );
     }
 
+    const numericId =
+      typeof ref === 'number' ? ref : /^\d+$/.test(ref) ? Number(ref) : null;
+
     const profile = await (this.prisma as any).integration_profile.findFirst({
-      where: { id: integrationProfileId },
+      where: numericId ? { id: numericId } : { slug: String(ref) },
       select: {
         config: true,
         integration_provider: { select: { slug: true } },
@@ -72,6 +115,7 @@ export class CaptchaService {
       token ?? '',
       profile.integration_provider?.slug as string,
       (profile.config ?? {}) as Record<string, string>,
+      context,
     );
   }
 
@@ -80,25 +124,32 @@ export class CaptchaService {
     token: string,
     providerSlug: string,
     config: Record<string, string>,
+    context: CaptchaVerifyContext = {},
   ): Promise<void> {
     if (!token) {
       throw new BadRequestException('CAPTCHA token is required.');
     }
 
+    if (token.length > MAX_TOKEN_LENGTH) {
+      throw new BadRequestException('CAPTCHA token is malformed.');
+    }
+
     switch (providerSlug) {
       case 'recaptcha':
         await this.verifyRemote(
           'https://www.google.com/recaptcha/api/siteverify',
-          config.secret_key,
+          config,
           token,
+          context,
         );
         break;
 
       case 'cloudflare-turnstile':
         await this.verifyRemote(
           'https://challenges.cloudflare.com/turnstile/v0/siteverify',
-          config.secret_key,
+          config,
           token,
+          context,
         );
         break;
 
@@ -148,16 +199,82 @@ export class CaptchaService {
     return value ? String(value) : null;
   }
 
+  /**
+   * Hostnames que o perfil aceita, em `config.hostnames` (separados por virgula).
+   * Vazio significa "nao confira" - todo perfil ja existente continua valendo.
+   */
+  static parseHostnames(config: Record<string, unknown> | null): Set<string> {
+    const raw = config?.hostnames ?? config?.allowed_hostnames;
+    return new Set(
+      String(raw ?? '')
+        .split(',')
+        .map((hostname) => hostname.trim().toLowerCase())
+        .filter(Boolean),
+    );
+  }
+
+  /**
+   * Chamada canonica de siteverify: manda o IP do visitante, tem timeout, e
+   * confere `action` e `hostname` alem do `success`.
+   *
+   * Toda falha - rede, HTTP nao-2xx, corpo que nao e JSON - vira falha de
+   * CAPTCHA. Deixar a excecao subir crua transformaria um solavanco do provedor em
+   * 500, e o visitante veria "erro do servidor" no lugar de "tente de novo".
+   */
   private async verifyRemote(
     url: string,
-    secret: string,
+    config: Record<string, string>,
     token: string,
+    context: CaptchaVerifyContext,
   ): Promise<void> {
-    const body = new URLSearchParams({ secret, response: token });
-    const response = await fetch(url, { method: 'POST', body });
-    const json = (await response.json()) as { success: boolean };
+    const body = new URLSearchParams({
+      secret: config.secret_key,
+      response: token,
+    });
+
+    if (context.remoteIp) {
+      body.set('remoteip', context.remoteIp);
+    }
+
+    let result: SiteverifyResponse;
+    try {
+      const response = await fetch(url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        signal: AbortSignal.timeout(SITEVERIFY_TIMEOUT_MS),
+        body,
+      });
+
+      if (!response.ok) {
+        throw new Error(`siteverify ${response.status}`);
+      }
+
+      result = (await response.json()) as SiteverifyResponse;
+    } catch {
+      throw new BadRequestException('CAPTCHA validation failed.');
+    }
+
+    if (!result?.success) {
+      throw new BadRequestException('CAPTCHA validation failed.');
+    }
+
+    // As duas checagens abaixo so valem quando os dois lados informaram o campo:
+    // o reCAPTCHA v2 nao devolve `action`, e um perfil sem `hostnames` nao pediu
+    // conferencia de origem.
+    if (
+      context.expectedAction &&
+      result.action &&
+      result.action !== context.expectedAction
+    ) {
+      throw new BadRequestException('CAPTCHA validation failed.');
+    }
 
-    if (!json.success) {
+    const hostnames = CaptchaService.parseHostnames(config);
+    if (
+      hostnames.size > 0 &&
+      result.hostname &&
+      !hostnames.has(result.hostname.toLowerCase())
+    ) {
       throw new BadRequestException('CAPTCHA validation failed.');
     }
   }

package/src/core.module.ts

@@ -25,6 +25,7 @@ import { LeakedPasswordModule } from './leaked-password/leaked-password.module';
 import { LeakedPasswordService } from './leaked-password/leaked-password.service';
 import { MailLayoutModule } from './mail-layout/mail-layout.module';
 import { MailModule } from './mail/mail.module';
+import { MessageTemplateModule } from './message-template/message-template.module';
 import { McpChatModule } from './mcp-chat/mcp-chat.module';
 import { McpModule } from './mcp/mcp.module';
 import { MenuModule } from './menu/menu.module';
@@ -33,6 +34,7 @@ import { NotificationModule } from './notification/notification.module';
 import { OAuthModule } from './oauth/oauth.module';
 import { PresenceModule } from './presence/presence.module';
 import { RealtimeModule } from './realtime/realtime.module';
+import { RedisModule } from './redis/redis.module';
 import { PdfModule } from './pdf/pdf.module';
 import { ProfileModule } from './profile/profile.module';
 import { RoleModule } from './role/role.module';
@@ -87,6 +89,7 @@ import { WhatsappSenderModule } from './whatsapp-sender/whatsapp-sender.module';
     forwardRef(() => IncidentModule),
     forwardRef(() => LeakedPasswordModule),
     forwardRef(() => MailModule),
+    forwardRef(() => MessageTemplateModule),
     forwardRef(() => MailLayoutModule),
     forwardRef(() => IntegrationProfileModule),
     forwardRef(() => WhatsappSenderModule),
@@ -110,6 +113,7 @@ import { WhatsappSenderModule } from './whatsapp-sender/whatsapp-sender.module';
     forwardRef(() => AccessLogModule),
     forwardRef(() => RealtimeModule),
     forwardRef(() => PresenceModule),
+    RedisModule,
     MailboxModule,
 
     MeetingModule,
@@ -120,6 +124,7 @@ import { WhatsappSenderModule } from './whatsapp-sender/whatsapp-sender.module';
     IncidentModule,
     LeakedPasswordModule,
     MailModule,
+    MessageTemplateModule,
     MailLayoutModule,
     IntegrationProfileModule,
     WhatsappSenderModule,
@@ -151,6 +156,7 @@ import { WhatsappSenderModule } from './whatsapp-sender/whatsapp-sender.module';
     AccessLogModule,
     RealtimeModule,
     PresenceModule,
+    RedisModule,
     CaptchaModule,
   ],
   providers: [

package/src/dashboard/dashboard-component-role/dashboard-component-role.service.ts

@@ -11,6 +11,7 @@ import {
     CreateDashboardComponentRoleBatchDTO,
     CreateDashboardComponentRoleDTO,
 } from './dto';
+import { DASHBOARD_COMPONENT_ROLE_SORT } from './dashboard-component-role.sort';
 
 @Injectable()
 export class DashboardComponentRoleService {
@@ -46,11 +47,9 @@ export class DashboardComponentRoleService {
             },
           },
         },
-        orderBy: {
-          id: 'desc',
-        },
       },
       'dashboardComponentRole',
+      { sort: DASHBOARD_COMPONENT_ROLE_SORT },
     );
   }
 

package/src/dashboard/dashboard-component-role/dashboard-component-role.sort.ts

@@ -0,0 +1,18 @@
+import { defineSortable } from '@hed-hog/api-pagination';
+
+/**
+ * Campos ordenáveis de `dashboard_component_role`. Nomes localizados
+ * (`dashboard_component_locale`/`role_locale`) ficam de fora — relação de
+ * locale, dois saltos. `component_slug`/`role_slug` ordenam pelo slug da
+ * relação to-one, que o Prisma já suporta direto.
+ */
+export const DASHBOARD_COMPONENT_ROLE_SORT = defineSortable(
+  {
+    id: { initialOrder: 'desc' },
+    component_slug: {
+      orderBy: (dir) => ({ dashboard_component: { slug: dir } }),
+    },
+    role_slug: { orderBy: (dir) => ({ role: { slug: dir } }) },
+  },
+  { default: 'id', defaultOrder: 'desc' },
+);

package/src/dashboard/dashboard-item/dashboard-item.service.ts

@@ -8,6 +8,7 @@ import {
   NotFoundException
 } from '@nestjs/common';
 import { CreateDashboardItemDTO } from './dto';
+import { DASHBOARD_ITEM_SORT } from './dashboard-item.sort';
 
 @Injectable()
 export class DashboardItemService {
@@ -46,11 +47,9 @@ export class DashboardItemService {
             },
           },
         },
-        orderBy: {
-          id: 'desc',
-        },
       },
       'dashboardItem',
+      { sort: DASHBOARD_ITEM_SORT },
     );
   }
 

package/src/dashboard/dashboard-item/dashboard-item.sort.ts

@@ -0,0 +1,19 @@
+import { defineSortable } from '@hed-hog/api-pagination';
+
+/**
+ * Campos ordenáveis de `dashboard_item`. Os nomes localizados exibidos na
+ * tela (`dashboard.dashboard_locale.name`, `dashboard_component.
+ * dashboard_component_locale.name`) ficam de fora — relação de locale, dois
+ * saltos a partir de `dashboard_item`. `dashboard_slug`/`component_slug`
+ * ordenam pelo slug da relação to-one, que o Prisma já suporta direto.
+ */
+export const DASHBOARD_ITEM_SORT = defineSortable(
+  {
+    id: { initialOrder: 'desc' },
+    dashboard_slug: { orderBy: (dir) => ({ dashboard: { slug: dir } }) },
+    component_slug: {
+      orderBy: (dir) => ({ dashboard_component: { slug: dir } }),
+    },
+  },
+  { default: 'id', defaultOrder: 'desc' },
+);

package/src/dashboard/dashboard-role/dashboard-role.service.ts

@@ -11,6 +11,7 @@ import {
     CreateDashboardRoleBatchDTO,
     CreateDashboardRoleDTO,
 } from './dto';
+import { DASHBOARD_ROLE_SORT } from './dashboard-role.sort';
 
 @Injectable()
 export class DashboardRoleService {
@@ -46,11 +47,9 @@ export class DashboardRoleService {
             },
           },
         },
-        orderBy: {
-          id: 'desc',
-        },
       },
       'dashboardRole',
+      { sort: DASHBOARD_ROLE_SORT },
     );
   }
 

package/src/dashboard/dashboard-role/dashboard-role.sort.ts

@@ -0,0 +1,16 @@
+import { defineSortable } from '@hed-hog/api-pagination';
+
+/**
+ * Campos ordenáveis de `dashboard_role`. Nomes localizados
+ * (`dashboard_locale`/`role_locale`) ficam de fora — relação de locale, dois
+ * saltos. `dashboard_slug`/`role_slug` ordenam pelo slug da relação to-one,
+ * que o Prisma já suporta direto.
+ */
+export const DASHBOARD_ROLE_SORT = defineSortable(
+  {
+    id: { initialOrder: 'desc' },
+    dashboard_slug: { orderBy: (dir) => ({ dashboard: { slug: dir } }) },
+    role_slug: { orderBy: (dir) => ({ role: { slug: dir } }) },
+  },
+  { default: 'id', defaultOrder: 'desc' },
+);