@greatapps/common 1.1.784 → 1.1.786

package/src/components/layouts/NavBar.tsx

@@ -6,13 +6,11 @@ import Link from "next/link";
 import { useTranslations } from "next-intl";
 import { IconChevronRight } from "@tabler/icons-react";
 import { Separator } from "../ui/data-display/Separator";
-import { GreatDomainIcon } from "./GreatDomainIcon";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/overlay/Tooltip";
 import {
   useDesktopSidebarStore,
   useDesktopSidebarHydration,
 } from "../../store/useDesktopSidebarStore";
-import { useMdSidebarHydration } from "../../store/useMdSidebarStore";
 import {
   useWhitelabel,
   useIsDefaultWhitelabel,
@@ -22,9 +20,7 @@ import { cn } from "../../infra/utils/clsx";
 type NavBarProps = {
   logoHref: string;
   appIconHref: string;
-  /** Sem href o ícone do GreatDomain não é renderizado: é a flag do app. */
-  domainIconHref?: string;
-  activeApp?: "gapps" | "gpages" | "gdomain";
+  activeApp?: "gapps" | "gpages";
   showExpandButton?: boolean;
   onExpandClick?: () => void;
   children?: React.ReactNode;
@@ -34,7 +30,6 @@ type NavBarProps = {
 function NavBar({
   logoHref,
   appIconHref,
-  domainIconHref,
   activeApp,
   showExpandButton = false,
   onExpandClick,
@@ -45,7 +40,6 @@ function NavBar({
   const { isExpanded: isDesktopExpanded, toggle: toggleDesktop } =
     useDesktopSidebarStore();
   useDesktopSidebarHydration();
-  useMdSidebarHydration();
   const { whitelabel } = useWhitelabel();
   const isDefaultWl = useIsDefaultWhitelabel();
   const primaryColor = whitelabel?.general?.primary_color;
@@ -136,9 +130,7 @@ function NavBar({
                   <IconChevronRight size={16} className="text-gray-500" />
                 </button>
               </TooltipTrigger>
-              <TooltipContent side="right">
-                {translate("common.layout.navbar.expandMenu")}
-              </TooltipContent>
+              <TooltipContent side="right">{translate('common.layout.navbar.expandMenu')}</TooltipContent>
             </Tooltip>
           )}
           {/* Desktop expand button */}
@@ -152,164 +144,78 @@ function NavBar({
                   <IconChevronRight size={16} className="text-gray-500" />
                 </button>
               </TooltipTrigger>
-              <TooltipContent side="right">
-                {translate("common.layout.navbar.expandMenu")}
-              </TooltipContent>
+              <TooltipContent side="right">{translate('common.layout.navbar.expandMenu')}</TooltipContent>
             </Tooltip>
           )}
         </div>
 
-        {/* Ícones de app — 8px entre eles (Figma 5929:2676) */}
-        <div className="flex flex-col gap-2 items-center">
-          {/* GreatPages icon */}
-          <div className="relative">
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Link
-                  href={appIconHref}
-                  className={cn(
-                    "size-10 rounded-lg cursor-pointer flex items-center justify-center border-2 ring-2 transition-colors duration-300",
-                    activeApp === "gpages"
-                      ? isDefaultWl
-                        ? "bg-cyan-100 border-white ring-cyan-300"
-                        : "border-white ring-transparent"
-                      : isDefaultWl
-                        ? "hover:bg-gray-100 border-transparent ring-transparent"
-                        : "border-transparent ring-transparent",
-                  )}
-                  style={
-                    !isDefaultWl
-                      ? {
-                          backgroundColor: primaryColor,
-                          boxShadow:
-                            activeApp === "gpages"
-                              ? `0 0 0 2px ${primaryColor}40`
-                              : undefined,
-                          opacity: activeApp !== "gpages" ? 0.2 : undefined,
-                        }
-                      : undefined
-                  }
-                >
-                  {isDefaultWl ? (
-                    <Image
-                      src="/icons/icon-navbar.svg"
-                      alt="GreatPages"
-                      width={24}
-                      height={24}
-                    />
-                  ) : (
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      width="24"
-                      height="24"
-                      viewBox="0 0 24 24"
-                      fill="none"
-                      stroke="white"
-                      strokeWidth="2"
-                      strokeLinecap="round"
-                      strokeLinejoin="round"
-                    >
-                      <path d="M4 8h16" />
-                      <path d="M4 6a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2h-12a2 2 0 0 1 -2 -2l0 -12" />
-                      <path d="M8 4v4" />
-                    </svg>
-                  )}
-                </Link>
-              </TooltipTrigger>
-              <TooltipContent side="right">
-                {isDefaultWl
-                  ? translate("common.layout.navbar.greatPages")
-                  : translate("common.layout.navbar.pages")}
-              </TooltipContent>
-            </Tooltip>
-            <div
-              className={cn(
-                "absolute -left-4 top-1/2 -translate-y-1/2 z-10 w-[3px] h-5 rounded-r-xl transition-opacity duration-300",
-                isDefaultWl ? "bg-cyan-300" : "",
-                activeApp === "gpages" ? "opacity-100" : "opacity-0",
-              )}
-              style={
-                !isDefaultWl ? { backgroundColor: primaryColor } : undefined
-              }
-            />
-          </div>
-
-          {/* GreatDomain icon */}
-          {domainIconHref ? (
-            <div className="relative">
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Link
-                    href={domainIconHref}
-                    aria-label={
-                      isDefaultWl
-                        ? translate("common.layout.navbar.greatDomain")
-                        : translate("common.layout.navbar.domains")
-                    }
-                    className={cn(
-                      "size-10 rounded-[10px] cursor-pointer flex items-center justify-center border-2 ring-2 transition-colors duration-300",
-                      activeApp === "gdomain"
-                        ? isDefaultWl
-                          ? "bg-[#EDE9FE] border-white ring-[#C092FF]"
-                          : "border-white ring-transparent"
-                        : isDefaultWl
-                          ? "hover:bg-gray-100 border-transparent ring-transparent"
-                          : "border-transparent ring-transparent",
-                    )}
-                    style={
-                      !isDefaultWl
-                        ? {
-                            backgroundColor: primaryColor,
-                            boxShadow:
-                              activeApp === "gdomain"
-                                ? `0 0 0 2px ${primaryColor}40`
-                                : undefined,
-                            opacity: activeApp !== "gdomain" ? 0.2 : undefined,
-                          }
-                        : undefined
-                    }
-                  >
-                    {isDefaultWl ? (
-                      <GreatDomainIcon active={activeApp === "gdomain"} />
-                    ) : (
-                      <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        width="24"
-                        height="24"
-                        viewBox="0 0 24 24"
-                        fill="none"
-                        stroke="white"
-                        strokeWidth="2"
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                      >
-                        <path d="M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0" />
-                        <path d="M3.6 9h16.8" />
-                        <path d="M3.6 15h16.8" />
-                        <path d="M11.5 3a17 17 0 0 0 0 18" />
-                        <path d="M12.5 3a17 17 0 0 1 0 18" />
-                      </svg>
-                    )}
-                  </Link>
-                </TooltipTrigger>
-                <TooltipContent side="right">
-                  {isDefaultWl
-                    ? translate("common.layout.navbar.greatDomain")
-                    : translate("common.layout.navbar.domains")}
-                </TooltipContent>
-              </Tooltip>
-              <div
+        {/* GreatPages icon */}
+        <div className="relative">
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Link
+                href={appIconHref}
                 className={cn(
-                  "absolute -left-4 top-1/2 -translate-y-1/2 z-10 w-[3px] h-5 rounded-r-xl transition-opacity duration-300",
-                  isDefaultWl ? "bg-[#984DFF]" : "",
-                  activeApp === "gdomain" ? "opacity-100" : "opacity-0",
+                  "size-10 rounded-lg cursor-pointer flex items-center justify-center border-2 ring-2 transition-colors duration-300",
+                  activeApp === "gpages"
+                    ? isDefaultWl
+                      ? "bg-cyan-100 border-white ring-cyan-300"
+                      : "border-white ring-transparent"
+                    : isDefaultWl
+                      ? "hover:bg-gray-100 border-transparent ring-transparent"
+                      : "border-transparent ring-transparent",
                 )}
                 style={
-                  !isDefaultWl ? { backgroundColor: primaryColor } : undefined
+                  !isDefaultWl
+                    ? {
+                        backgroundColor: primaryColor,
+                        boxShadow:
+                          activeApp === "gpages"
+                            ? `0 0 0 2px ${primaryColor}40`
+                            : undefined,
+                        opacity: activeApp !== "gpages" ? 0.2 : undefined,
+                      }
+                    : undefined
                 }
-              />
-            </div>
-          ) : null}
+              >
+                {isDefaultWl ? (
+                  <Image
+                    src="/icons/icon-navbar.svg"
+                    alt="GreatPages"
+                    width={24}
+                    height={24}
+                  />
+                ) : (
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="24"
+                    height="24"
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="white"
+                    strokeWidth="2"
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                  >
+                    <path d="M4 8h16" />
+                    <path d="M4 6a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2h-12a2 2 0 0 1 -2 -2l0 -12" />
+                    <path d="M8 4v4" />
+                  </svg>
+                )}
+              </Link>
+            </TooltipTrigger>
+            <TooltipContent side="right">
+              {isDefaultWl ? translate('common.layout.navbar.greatPages') : translate('common.layout.navbar.pages')}
+            </TooltipContent>
+          </Tooltip>
+          <div
+            className={cn(
+              "absolute -left-4 top-1/2 -translate-y-1/2 z-10 w-[3px] h-5 rounded-r-xl transition-opacity duration-300",
+              isDefaultWl ? "bg-cyan-300" : "",
+              activeApp === "gpages" ? "opacity-100" : "opacity-0",
+            )}
+            style={!isDefaultWl ? { backgroundColor: primaryColor } : undefined}
+          />
         </div>
       </div>
 

package/src/components/modals/cards/AddCardModal.tsx

@@ -87,6 +87,15 @@ export default function AddCardModal() {
   const [isAuthenticating, setIsAuthenticating] = useState(false);
 
   const onCardAdded = modalData.onCardAdded as ((cardId: string) => void) | undefined;
+  /* `set_default` continua true por omissão — todo chamador que só quer cadastrar um cartão segue
+   * com o comportamento de sempre. Quem passa `false` é quem vai perguntar ao usuário, logo depois
+   * do cadastro, se a assinatura deve migrar para este cartão.
+   *
+   * Sem esse controle a pergunta seria decorativa: o backend, ao receber `set_default: true`, já
+   * grava o padrão do customer E reaponta as assinaturas cobráveis (`#propagateDefaultPm` em
+   * cards/services.js), então quando o modal abrisse a troca já teria acontecido e "Recusar" não
+   * teria nada para recusar. */
+  const setAsDefault = modalData.setAsDefault !== false;
 
   const createSetupIntentMutation = useCreateSetupIntent();
   const createCardMutation = useCreateCard();
@@ -232,7 +241,7 @@ export default function AddCardModal() {
       const cardResult = await createCardMutation.mutateAsync({
         setup_intent_id: intent.setup_intent_id,
         name: data.name,
-        set_default: true,
+        set_default: setAsDefault,
         ...(isInternational
           ? {}
           : {
@@ -250,6 +259,11 @@ export default function AddCardModal() {
         country: data.country,
       });
 
+      /* Fecha ANTES de avisar quem chamou. `closeModal()` remove o topo da pilha do
+       * useModalManager, então um modal aberto de dentro do `onCardAdded` seria justamente o topo
+       * e sairia junto — abriria e fecharia no mesmo tick, sem o usuário ver nada. */
+      handleClose();
+
       if (cardResult.success && cardResult.data?.id != null) {
         onCardAdded?.(cardResult.data.id.toString());
       }
@@ -258,7 +272,6 @@ export default function AddCardModal() {
         (t) => <Toast variant="success" message={translate('common.cards.add.successToast')} toastId={t} />,
         { duration: 5000 }
       );
-      handleClose();
     } catch (error) {
       /* O backend fail-closed devolve a razão exata da recusa (ex.: "CPF do pagador inválido —
        * confira os dígitos verificadores"), e o withAction relança como Error com essa mensagem.

package/src/components/ui/form/PhoneInput.tsx

@@ -45,7 +45,7 @@ export default function PhoneInput({
   const translate = useTranslations();
   const parsed = parsePhoneValue(value ?? '');
   const [selectedCountry, setSelectedCountry] = useState<Country>(parsed.country);
-  const [phoneNumber, setPhoneNumber] = useState(formatNational(parsed.number, parsed.country.iso));
+  const [phoneNumber, setPhoneNumber] = useState(parsed.number);
   const [search, setSearch] = useState('');
   const [open, setOpen] = useState(false);
   const prevValueRef = useRef(value);

package/src/handlers.ts

@@ -20,7 +20,6 @@ export { createListAvailableUsersHandler } from './modules/projects/handlers/lis
 export { createListAllAccountUsersHandler } from './modules/projects/handlers/list-all-account-users.handler';
 
 export { createListSubscriptionsHandler } from './modules/subscriptions/handlers/list-subscriptions.handler';
-export { createCurrentSubscriptionHandler } from './modules/subscriptions/handlers/current-subscription.handler';
 export { createFreezeNoticeHandler } from './modules/subscriptions/handlers/freeze-notice.handler';
 
 export { createListMessagesHandler } from './modules/users/handlers/list-messages.handler';

package/src/i18n/messages/en-us.ts

@@ -540,8 +540,6 @@ const messages = {
       expandMenu: 'Expand menu',
       greatPages: 'GreatPages',
       pages: 'Pages',
-      greatDomain: 'GreatDomain',
-      domains: 'Domains',
     },
     profile: {
       usedCredits: 'Credits used',

package/src/i18n/messages/es-es.ts

@@ -541,8 +541,6 @@ const messages = {
       expandMenu: 'Expandir menú',
       greatPages: 'GreatPages',
       pages: 'Páginas',
-      greatDomain: 'GreatDomain',
-      domains: 'Dominios',
     },
     profile: {
       usedCredits: 'Créditos utilizados',

package/src/i18n/messages/pt-br.ts

@@ -620,8 +620,6 @@ const messages = {
       expandMenu: 'Expandir menu',
       greatPages: 'GreatPages',
       pages: 'Páginas',
-      greatDomain: 'GreatDomain',
-      domains: 'Domínios',
     },
     profile: {
       usedCredits: 'Créditos usados',

package/src/index.ts

@@ -86,8 +86,6 @@ export {
   CHARGES_QUERY_KEY,
   FREEZE_NOTICE_QUERY_KEY,
 } from "./modules/subscriptions/constants/query-keys.constants";
-export { useCurrentSubscription } from "./modules/subscriptions/hooks/use-current-subscription.hook";
-/** @deprecated Use `useCurrentSubscription`. Sai na 1.1.784. */
 export { useActiveSubscription } from "./modules/subscriptions/hooks/find-active-subscription.hook";
 export { useCancelledSubscriptionGuard } from "./modules/subscriptions/hooks/use-cancelled-subscription-guard";
 export { useAccountFreeze } from "./modules/subscriptions/hooks/use-account-freeze.hook";
@@ -142,6 +140,7 @@ export type {
   Subscription,
   SubscriptionItem,
   FindSubscriptionsParams,
+  ChargeNowResult,
 } from "./modules/subscriptions/types/subscription.type";
 export {
   SubscriptionSchema,
@@ -223,11 +222,7 @@ export {
   confirmPaymentIfRequired,
   PaymentAuthenticationError,
 } from "./modules/subscriptions/utils/confirm-payment-if-required";
-export {
-  SUBSCRIPTION_GRACE_PERIOD_DAYS,
-  FREE_PLAN_ID,
-} from "./modules/subscriptions/constants/subscription.constants";
-export { groupSubscriptionsByProduct } from "./modules/subscriptions/utils/group-subscriptions-by-product";
+export { SUBSCRIPTION_GRACE_PERIOD_DAYS } from "./modules/subscriptions/constants/subscription.constants";
 export { getSubscriptionCancellationState } from "./modules/subscriptions/utils/get-subscription-cancellation-state";
 export type { SubscriptionCancellationState } from "./modules/subscriptions/utils/get-subscription-cancellation-state";
 export {
@@ -296,7 +291,7 @@ export { formatShortDate, formatDateTime, calendarDateSchema, toCalendarDate, da
 export { buildQueryParams } from "./infra/utils/params";
 export { parseSchema, parseResult } from "./infra/utils/parser";
 export { withAction } from "./utils/withAction";
-export { resolveSafeRedirect, sameHostOr } from "./utils/redirect";
+export { resolveSafeRedirect, sameHostOr, isSameSiteUrl } from "./utils/redirect";
 export { COUNTRIES, flagUrl } from "./utils/countries";
 export type { Country } from "./utils/countries";
 

package/src/infra/api/client.ts

@@ -31,11 +31,6 @@ export interface ApiClientOptions {
   emitLogs?: boolean;
 }
 
-interface ApiErrorResponseBody {
-  message?: string | { message?: string };
-  code?: string;
-}
-
 export interface RequestConfig extends RequestInit {
   timeout?: number;
   /** Padrão `json`. Use `text` quando a API devolve corpo não-JSON. */
@@ -174,12 +169,9 @@ class ApiClient {
         let message = `HTTP error ${response.status} ${response.statusText} ${errBody}`;
         let code = "HTTP_ERROR";
         try {
-          const errorData: ApiErrorResponseBody = JSON.parse(errBody);
-          if (typeof errorData.message === "string") {
-            message = errorData.message;
-          } else if (errorData.message?.message) {
-            message = errorData.message.message;
-          }
+          const errorData = JSON.parse(errBody) as Record<string, unknown>;
+          // @ts-ignore -- msg pode ser string ou objeto com .message
+          message = errorData.message?.message ?? errorData.message ?? message;
           if (typeof errorData.code === "string") code = errorData.code;
         } catch {
           if (errBody.trim()) message = errBody.trim();

package/src/infra/api/types.ts

@@ -1,9 +1,9 @@
 import z from 'zod';
 
-export const PaginationParamsSchema = z.object({
-  page: z.number().min(1).optional().default(1),
-  limit: z.number().optional().default(20),
-});
+export const PaginationParamsSchema = z.object({
+  page: z.number().min(1).optional().default(1),
+  limit: z.number().optional().default(20),
+});
 
 export interface PaginationParams extends z.infer<typeof PaginationParamsSchema> {}
 
@@ -51,8 +51,6 @@ export interface PaginatedSuccessResult<T> extends Omit<SuccessResult<T>, 'data'
 export interface ErrorResult {
   success: false;
   error?: string;
-  code?: string;
-  statusCode?: number;
 }
 
 export type ActionResult<T> = SuccessResult<T> | ErrorResult;
@@ -62,7 +60,7 @@ export class ApiError extends Error {
   public readonly code: string;
   public readonly statusCode: number;
 
-  constructor(message: string = 'Erro desconhecido', code: string = 'UNKNOWN_ERROR', statusCode: number = 500) {
+  constructor(message: string, code: string = 'UNKNOWN_ERROR', statusCode: number = 500) {
     super(message);
     this.name = 'ApiError';
     this.code = code;

package/src/infra/route/safe-route-handler.ts

@@ -8,10 +8,7 @@ export async function safeRouteHandler<T>(fn: () => Promise<T>): Promise<Respons
     return Response.json({ success: true, data });
   } catch (error) {
     if (error instanceof ApiError) {
-      return Response.json(
-        { success: false, error: error.message, code: error.code },
-        { status: error.statusCode },
-      );
+      return Response.json({ success: false, error: error.message }, { status: error.statusCode });
     }
     console.error('[safeRouteHandler] erro inesperado', error);
     return Response.json({ success: false, error: 'Erro interno do servidor' }, { status: 500 });

package/src/middlewares/create-auth-middleware.ts

@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server';
 
 import { continueChain, MiddlewareConfig, MiddlewareFunction, MiddlewareResult, stopChain } from './types';
 import { whitelabelService } from '../modules/whitelabel/services/whitelabel.service';
+import { isSameSiteUrl } from '../utils/redirect';
 
 function isRouteEquals(pathname: string, routes: string[]): boolean {
   return routes.some((route) => pathname === route || pathname.startsWith(`${route}/`));
@@ -27,8 +28,18 @@ export function createAuthMiddleware(options?: CreateAuthMiddlewareOptions): Mid
       const host = request.headers.get('host') || '';
       const whitelabel = await whitelabelService.getTokenByDomain(host).catch(() => null);
       const accountsUrl = whitelabel?.accounts_url;
+      const accountsUrlIsSameSite = !!accountsUrl && isSameSiteUrl(accountsUrl, host);
+
+      if (accountsUrl && !accountsUrlIsSameSite) {
+        console.error('[auth-middleware] accounts_url fora do site do host da requisição', {
+          host,
+          pathname,
+          whitelabelId: whitelabel?.id,
+          accountsUrl,
+        });
+      }
 
-      const loginUrl = accountsUrl
+      const loginUrl = accountsUrlIsSameSite
         ? new URL('/login', accountsUrl)
         : new URL('/login', request.url);
 

package/src/modules/auth/utils/assert-account-not-frozen.ts

@@ -1,23 +1,22 @@
 import "server-only";
 
 import { ApiError } from "../../../infra/api/types";
-import { readCurrentSubscription } from "../../subscriptions/utils/read-current-subscription";
+import { listSubscriptionsAction } from "../../subscriptions/actions/list-subscriptions.action";
 import { getAccountFreezeState } from "../../subscriptions/utils/get-account-freeze-state";
-import type { Subscription } from "../../subscriptions/types/subscription.type";
 
 export async function assertAccountNotFrozen(): Promise<void> {
-  let subscription: Subscription | null;
+  const result = await listSubscriptionsAction({ active: true });
 
-  try {
-    subscription = await readCurrentSubscription();
-  } catch (error) {
+  if (!result.success) {
     console.error(
       "[assertAccountNotFrozen] failed to read subscription context:",
-      error,
+      result.error,
     );
     return;
   }
 
+  const subscription = result.data?.data?.[0];
+
   if (!subscription) return;
 
   if (getAccountFreezeState(subscription) !== "frozen") return;

package/src/modules/auth/utils/assert-management-subscription.ts

@@ -1,23 +1,32 @@
 import "server-only";
 
+import { cache } from "react";
+
 import { ApiError } from "../../../infra/api/types";
-import { readCurrentSubscription } from "../../subscriptions/utils/read-current-subscription";
-import { getSubscriptionCancellationState } from "../../subscriptions/utils/get-subscription-cancellation-state";
+import { listSubscriptionsAction } from "../../subscriptions/actions/list-subscriptions.action";
 import { getSubscriptionExpiryDate } from "../../subscriptions/utils/get-subscription-expiry-date";
 
 /**
- * A leitura por trás (`readCurrentSubscription`) já é deduplicada por request via
- * React.cache, então não precisa de outra camada aqui: em produção (26/08) o mesmo
- * carregamento disparava até quatro cópias da mesma pergunta em paralelo, com 727 ms,
- * 4,2 s, 5,0 s e 7,0 s, contra um p50 de 528 ms; agora é uma leitura só,
- * compartilhada pelos quatro gates.
+ * Deduplicado por request via React.cache, como `getCurrentUserProfile` e `requireValidSession`.
  *
- * A checagem de cancelamento é obrigatória além da de vencimento: a corrente pode
- * vir com `active: false` (baixa por falha de pagamento) com `date_due` ainda no
- * futuro, caso que só `getSubscriptionExpiryDate` não cobre.
+ * A leitura por trás é `/accounts/{id}/subscriptions?limit=1`, e ela é MAIS cara que o gate de
+ * perfil: para conta Stripe a listagem consulta a API do gateway ao vivo. Em produção (26/08) o
+ * mesmo carregamento disparou quatro dessas em paralelo — 727 ms, 4,2 s, 5,0 s e 7,0 s, contra um
+ * p50 de 528 ms para o endpoint. Elas se atrasam entre si: são cópias da mesma pergunta disputando
+ * a mesma fila.
  */
-export async function assertManagementSubscription(): Promise<void> {
-  const subscription = await readCurrentSubscription();
+export const assertManagementSubscription = cache(async () => {
+  const result = await listSubscriptionsAction({ active: true });
+
+  if (!result.success) {
+    throw new ApiError(
+      result.error || "Não foi possível validar a assinatura atual",
+      "SUBSCRIPTION_CONTEXT_FAILED",
+      403,
+    );
+  }
+
+  const subscription = result.data?.data?.[0];
 
   if (!subscription) {
     throw new ApiError(
@@ -27,15 +36,14 @@ export async function assertManagementSubscription(): Promise<void> {
     );
   }
 
-  const isCancelled = getSubscriptionCancellationState(subscription) === "cancelled";
   const expiryDate = getSubscriptionExpiryDate(subscription);
   const isExpired = !!expiryDate && Date.now() >= expiryDate.getTime();
 
-  if (isCancelled || isExpired) {
+  if (isExpired) {
     throw new ApiError(
       "Sua assinatura está vencida. Assine um novo plano para continuar.",
       "SUBSCRIPTION_EXPIRED",
       403,
     );
   }
-}
+});

package/src/modules/auth/utils/assert-paid-subscription.ts

@@ -1,13 +1,21 @@
 import "server-only";
 
 import { ApiError } from "../../../infra/api/types";
-import { readCurrentSubscription } from "../../subscriptions/utils/read-current-subscription";
-import { getSubscriptionCancellationState } from "../../subscriptions/utils/get-subscription-cancellation-state";
+import { listSubscriptionsAction } from "../../subscriptions/actions/list-subscriptions.action";
 import { getSubscriptionExpiryDate } from "../../subscriptions/utils/get-subscription-expiry-date";
-import { FREE_PLAN_ID } from "../../subscriptions/constants/subscription.constants";
 
 export async function assertPaidSubscription() {
-  const subscription = await readCurrentSubscription();
+  const result = await listSubscriptionsAction({ active: true });
+
+  if (!result.success) {
+    throw new ApiError(
+      result.error || "Não foi possível validar a assinatura atual",
+      "SUBSCRIPTION_CONTEXT_FAILED",
+      403,
+    );
+  }
+
+  const subscription = result.data?.data?.[0];
 
   if (!subscription) {
     throw new ApiError(
@@ -17,11 +25,10 @@ export async function assertPaidSubscription() {
     );
   }
 
-  const isCancelled = getSubscriptionCancellationState(subscription) === "cancelled";
   const expiryDate = getSubscriptionExpiryDate(subscription);
   const isExpired = !!expiryDate && Date.now() >= expiryDate.getTime();
 
-  if (isCancelled || isExpired) {
+  if (isExpired) {
     throw new ApiError(
       "Sua assinatura está vencida. Assine um novo plano para continuar.",
       "SUBSCRIPTION_EXPIRED",
@@ -29,7 +36,8 @@ export async function assertPaidSubscription() {
     );
   }
 
-  if (subscription.type === 'free' || subscription.id_plan === FREE_PLAN_ID) {
+  
+  if (subscription.type === 'free' || subscription.id_plan === 5) {
     throw new ApiError(
       "Este recurso está disponível apenas para planos pagos. Faça upgrade do seu plano para continuar.",
       "PAID_SUBSCRIPTION_REQUIRED",