@greatapps/common 1.1.542 → 1.1.546

package/src/modules/cards/types.ts

@@ -1,16 +1,22 @@
 import z from 'zod';
 
+import {
+  PaginationParamsSchema,
+  SearchParamsSchema,
+  SortParamsSchema,
+} from '../../infra/api/types';
+
 export const CardSchema = z.object({
   id: z.union([z.number(), z.string()]),
-  id_wl: z.number().optional(),
-  id_account: z.union([z.number(), z.string()]).optional(),
+  id_wl: z.number(),
+  id_account: z.union([z.number(), z.string()]),
   id_gateway: z.union([z.number(), z.string()]).optional(),
-  gateway_account: z.string().optional(),
-  gateway_card: z.string().optional(),
+  gateway_account: z.string(),
+  gateway_card: z.string(),
   brand: z.string(),
   name: z.string(),
   number: z.string().nullable(),
-  date: z.string().nullable().optional(),
+  date: z.string().nullable(),
   deleted: z
     .number()
     .transform((val) => val === 1)
@@ -31,12 +37,8 @@ export const CreateCardRequestSchema = z.object({
 
 export type CreateCardRequest = z.infer<typeof CreateCardRequestSchema>;
 
-export const FindCardsParamsSchema = z.object({
-  page: z.number().optional(),
-  limit: z.number().optional(),
-  search: z.string().optional(),
-  sort: z.string().optional(),
-  order: z.enum(['asc', 'desc']).optional(),
-});
+export const FindCardsParamsSchema = PaginationParamsSchema.extend(SearchParamsSchema.shape).extend(
+  SortParamsSchema.shape
+);
 
 export type FindCardsParams = z.infer<typeof FindCardsParamsSchema>;

package/src/modules/plans/utils/map-api-plan-to-ui.ts

@@ -16,7 +16,7 @@ const BASE_FEATURES: PlanFeature[] = [
   { icon: "check", text: "Compartilhar páginas", tooltip: "sharePages" },
   { icon: "check", text: "Hospedagem inclusa" },
   { icon: "check", text: "SSL (HTTPS) + CDN" },
-  { icon: "check", text: "Templates Free" },
+  { icon: "check", text: "Templates gratuitos" },
 ];
 
 function buildMainFeaturesFromItems(items: Plan["items"]): PlanMainFeatures {

package/src/modules/projects/actions/add-project-user.action.ts

@@ -1,9 +1,9 @@
 'use server';
 
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { safeMutationAction } from '../../../utils/safeMutationAction';
 import { projectUsersService } from '../services/project-users.service';
 import type { AddRemoveProjectUsersParams } from '../types';
 
 export async function addProjectUserAction(params: AddRemoveProjectUsersParams) {
-  return safeServerAction(() => projectUsersService.addToProject(params));
+  return safeMutationAction(() => projectUsersService.addToProject(params));
 }

package/src/modules/projects/actions/create-project.action.ts

@@ -1,9 +1,9 @@
 'use server';
 
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { safeMutationAction } from '../../../utils/safeMutationAction';
 import { projectsService } from '../services/projects.service';
 import type { CreateProjectRequest } from '../types';
 
 export async function createProjectAction(data: CreateProjectRequest) {
-  return safeServerAction(() => projectsService.create(data));
+  return safeMutationAction(() => projectsService.create(data));
 }

package/src/modules/projects/actions/delete-project.action.ts

@@ -1,8 +1,8 @@
 'use server';
 
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { safeMutationAction } from '../../../utils/safeMutationAction';
 import { projectsService } from '../services/projects.service';
 
 export async function deleteProjectAction(projectId: number, moveToProjectId: number) {
-  return safeServerAction(() => projectsService.delete(projectId, moveToProjectId));
+  return safeMutationAction(() => projectsService.delete(projectId, moveToProjectId));
 }

package/src/modules/projects/actions/remove-project-user.action.ts

@@ -1,9 +1,9 @@
 'use server';
 
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { safeMutationAction } from '../../../utils/safeMutationAction';
 import { projectUsersService } from '../services/project-users.service';
 import type { AddRemoveProjectUsersParams } from '../types';
 
 export async function removeProjectUserAction(params: AddRemoveProjectUsersParams) {
-  return safeServerAction(() => projectUsersService.removeFromProject(params));
+  return safeMutationAction(() => projectUsersService.removeFromProject(params));
 }

package/src/modules/projects/actions/update-project.action.ts

@@ -1,9 +1,9 @@
 'use server';
 
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { safeMutationAction } from '../../../utils/safeMutationAction';
 import { projectsService } from '../services/projects.service';
 import type { UpdateProjectRequest } from '../types';
 
 export async function updateProjectAction(projectId: number, data: UpdateProjectRequest) {
-  return safeServerAction(() => projectsService.update(projectId, data));
+  return safeMutationAction(() => projectsService.update(projectId, data));
 }

package/src/modules/subscriptions/actions/update-subscription-plan.action.ts

@@ -1,6 +1,6 @@
 "use server";
 
-import { safeServerAction } from "../../../utils/safeServerAction";
+import { safeMutationAction } from "../../../utils/safeMutationAction";
 import type { UpdateSubscriptionPlanRequest } from "../types/calculate-subscription.type";
 import { subscriptionsService } from "../services/subscriptions.service";
 
@@ -8,7 +8,7 @@ export async function updateSubscriptionPlanAction(
   subscriptionId: number | string,
   data: UpdateSubscriptionPlanRequest,
 ) {
-  return safeServerAction(async () => {
+  return safeMutationAction(async () => {
     return subscriptionsService.updateSubscriptionPlan(subscriptionId, data);
   });
 }

package/src/modules/subscriptions/types/subscription.type.ts

@@ -41,7 +41,7 @@ export const SubscriptionSchema = z.object({
   id_gateway: z.union([z.number(), z.string()]).nullable(),
   gateway_account: z.string().nullable(),
   date_hiring: z.coerce.date().nullable(),
-  date_due: z.coerce.date(),
+  date_due: z.coerce.date().nullable(),
   date_cancellation: z.coerce.date().nullable(),
   date_verification: z.coerce.date().nullable(),
   cancellation_reason: z.string().nullable(),
@@ -52,6 +52,7 @@ export const SubscriptionSchema = z.object({
   card_name: z.string().nullable().optional(),
   card_brand: z.string().nullable().optional(),
   card_number: z.string().nullable().optional(),
+  card: z.record(z.string(), z.unknown()).nullable().optional(),
   items: z.array(SubscriptionItemSchema),
   pending_change: z.object({
     schedule_id: z.string(),

package/src/modules/users/action/mark-all-messages-as-read.action.ts

@@ -1,8 +1,8 @@
 'use server';
 
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { safeMutationAction } from '../../../utils/safeMutationAction';
 import { messagesService } from '../services/messages.service';
 
 export async function markAllMessagesAsReadAction() {
-  return safeServerAction(() => messagesService.markAllAsRead());
+  return safeMutationAction(() => messagesService.markAllAsRead());
 }

package/src/modules/users/action/mark-message-as-read.action.ts

@@ -1,8 +1,8 @@
 'use server';
 
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { safeMutationAction } from '../../../utils/safeMutationAction';
 import { messagesService } from '../services/messages.service';
 
 export async function markMessageAsReadAction(messageId: string) {
-  return safeServerAction(() => messagesService.markAsRead(messageId));
+  return safeMutationAction(() => messagesService.markAsRead(messageId));
 }

package/src/server.ts

@@ -73,8 +73,10 @@ export {
 // Server Utils
 export { getClientInfoFromRequest } from './infra/utils/client-info';
 export { getUserContext } from './modules/auth/utils/get-user-context';
+export { requireValidSession } from './modules/auth/utils/require-valid-session';
 export { buildWlOverride, buildWlOverrideFromJwt } from './modules/auth/utils/build-wl-override';
 export { safeServerAction } from './utils/safeServerAction';
+export { safeMutationAction } from './utils/safeMutationAction';
 
 // Image Processing (server-side)
 export { processImageAction } from './modules/images/actions/process-image.action';

package/src/store/useAccountModals.ts

@@ -13,18 +13,29 @@ export interface AccountModalsConfig {
   onGoToSubscription?: () => void;
 }
 
+interface DeleteAccountPayload {
+  password: string;
+}
+
 interface AccountModalsState {
   activeModal: AccountModalType | null;
   config: AccountModalsConfig;
   initialSection?: AccountSectionType;
 
+  /** Payload coletado no DeleteAccountModal, consumido pelo ConfirmDeleteAccountModal. */
+  deleteAccountPayload: DeleteAccountPayload | null;
+  /** Mensagem de erro do backend quando o delete falha (ex.: senha inválida).
+   *  Mostrada no DeleteAccountModal quando o usuário é mandado de volta. */
+  deleteAccountError: string | null;
+
   /** Called by <AccountModals> to keep app-level config in sync */
   updateConfig: (config: AccountModalsConfig) => void;
 
   openConfigurations: (initialSection?: AccountSectionType) => void;
-  openDeleteAccount: () => void;
+  openDeleteAccount: (error?: string) => void;
   openIsntPossibleDelete: () => void;
-  openConfirmDelete: () => void;
+  openConfirmDelete: (payload: DeleteAccountPayload) => void;
+  clearDeleteAccountError: () => void;
   close: () => void;
 }
 
@@ -32,21 +43,43 @@ export const useAccountModals = create<AccountModalsState>((set) => ({
   activeModal: null,
   config: {},
   initialSection: undefined,
+  deleteAccountPayload: null,
+  deleteAccountError: null,
 
   updateConfig: (config) => set({ config }),
 
   openConfigurations: (initialSection) =>
-    set({ activeModal: 'configurations', initialSection }),
+    set({
+      activeModal: 'configurations',
+      initialSection,
+      deleteAccountPayload: null,
+      deleteAccountError: null,
+    }),
 
-  openDeleteAccount: () =>
-    set({ activeModal: 'deleteAccount' }),
+  openDeleteAccount: (error) =>
+    set({
+      activeModal: 'deleteAccount',
+      deleteAccountPayload: null,
+      deleteAccountError: error ?? null,
+    }),
 
   openIsntPossibleDelete: () =>
     set({ activeModal: 'isntPossibleDelete' }),
 
-  openConfirmDelete: () =>
-    set({ activeModal: 'confirmDelete' }),
+  openConfirmDelete: (payload) =>
+    set({
+      activeModal: 'confirmDelete',
+      deleteAccountPayload: payload,
+      deleteAccountError: null,
+    }),
+
+  clearDeleteAccountError: () => set({ deleteAccountError: null }),
 
   close: () =>
-    set({ activeModal: null, initialSection: undefined }),
+    set({
+      activeModal: null,
+      initialSection: undefined,
+      deleteAccountPayload: null,
+      deleteAccountError: null,
+    }),
 }));

package/src/utils/safeMutationAction.ts

@@ -0,0 +1,30 @@
+import 'server-only';
+
+import type { ActionResult } from '../infra/api/types';
+import { requireValidSession } from '../modules/auth/utils/require-valid-session';
+import { safeServerAction } from './safeServerAction';
+
+/**
+ * Wrapper para server actions que mutam estado (delete/update/create/publish/
+ * billing/etc.). Faz validação de sessão contra o backend (`POST /auth/keep`)
+ * antes de executar a ação e roteia erros via `safeServerAction`.
+ *
+ * A validação é deduplicada por request — múltiplas actions sensíveis que
+ * rodem dentro de uma mesma request pagam 1 round-trip ao backend, não N.
+ *
+ * Motivação (resumo): o backend confia no par `(whitelabel-token, id_account
+ * no path)` nos endpoints de CRUD; o Next.js deriva `id_account` de
+ * `atob(cookie)` sem verificar assinatura. Chamar `requireValidSession`
+ * aqui garante que o cookie corresponde a uma sessão real no banco antes
+ * de qualquer mutação.
+ *
+ * Para reads não-sensíveis, continue usando `safeServerAction` direto.
+ */
+export async function safeMutationAction<T>(
+  fn: () => Promise<T>
+): Promise<ActionResult<T>> {
+  return safeServerAction(async () => {
+    await requireValidSession();
+    return fn();
+  });
+}