@greatapps/common 1.1.127 → 1.1.129

package/src/infra/api/client.ts

@@ -1,21 +1,37 @@
 import { ApiError } from './types';
 import { findWhitelabel } from '../../modules/whitelabel/actions/find-whitelabel.action';
 
-interface RequestConfig extends RequestInit {
+export interface ApiClientOptions {
+  /**
+   * Quando true, monta `{base}/{locale}/{wlId}{endpoint}` (ex.: r2-clone).
+   * Padrão false: `{base}/v1/{locale}/{wlId}{endpoint}`.
+   */
+  omitApiVersion?: boolean;
+}
+
+export interface RequestConfig extends RequestInit {
   timeout?: number;
+  /** Padrão `json`. Use `text` quando a API devolve corpo não-JSON. */
+  responseType?: 'json' | 'text';
 }
 
 class ApiClient {
   private readonly baseUrl: string;
   private readonly apiVersion = 'v1';
   private readonly apiLocale = 'pt-br';
+  private readonly omitApiVersion: boolean;
 
-  constructor(baseUrl: string) {
-    this.baseUrl = baseUrl;
+  constructor(baseUrl: string, options?: ApiClientOptions) {
+    this.baseUrl = baseUrl.replace(/\/$/, '');
+    this.omitApiVersion = options?.omitApiVersion ?? false;
   }
 
   private async buildUrl(endpoint: string, whiteLabelId: number): Promise<string> {
-    const url = `${this.baseUrl}/${this.apiVersion}/${this.apiLocale}/${whiteLabelId}${endpoint}`;
+    const wlPath = this.omitApiVersion
+      ? `/${this.apiLocale}/${whiteLabelId}`
+      : `/${this.apiVersion}/${this.apiLocale}/${whiteLabelId}`;
+    const path = endpoint.startsWith('/') ? endpoint : `/${endpoint}`;
+    const url = `${this.baseUrl}${wlPath}${path}`;
     console.log('[ApiClient] buildUrl', {
       baseURL: this.baseUrl,
       whiteLabelId,
@@ -44,7 +60,7 @@ class ApiClient {
   async request<T>(endpoint: string, config: RequestConfig = {}): Promise<T> {
     console.log('[ApiClient] request called', { endpoint, method: config.method });
 
-    const { timeout = 30000, ...fetchConfig } = config;
+    const { timeout = 30000, responseType = 'json', ...fetchConfig } = config;
 
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), timeout);
@@ -77,13 +93,22 @@ class ApiClient {
       console.log('[ApiClient] Response received', { status: response.status, ok: response.ok });
 
       if (!response.ok) {
-        const errorData = (await response.json().catch(() => ({}))) as Record<string, unknown>;
-        console.error('[ApiClient] Request failed', { status: response.status, errorData });
-        throw new ApiError(
-          (errorData.message as string) || `HTTP error ${response.status}`,
-          (errorData.code as string) || 'HTTP_ERROR',
-          response.status
-        );
+        const errBody = await response.text();
+        let message = `HTTP error ${response.status}`;
+        let code = 'HTTP_ERROR';
+        try {
+          const errorData = JSON.parse(errBody) as Record<string, unknown>;
+          if (typeof errorData.message === 'string') message = errorData.message;
+          if (typeof errorData.code === 'string') code = errorData.code;
+        } catch {
+          if (errBody.trim()) message = errBody.trim();
+        }
+        console.error('[ApiClient] Request failed', { status: response.status, message });
+        throw new ApiError(message, code, response.status);
+      }
+
+      if (responseType === 'text') {
+        return (await response.text()) as T;
       }
 
       const data = (await response.json()) as T;

package/src/modules/accounts/actions/account-management.action.ts

@@ -1,90 +1,90 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { accountService } from '../services/account.service';
-import type {
-  AccountUsersPaginationParams,
-  ChangePasswordRequest,
-  CreateAccountUserRequest,
-  UpdateAccountRequest,
-  UpdateAccountUserRequest,
-} from '../types';
-import { twoFactorService } from '../services/two-factor.service';
-
-export async function listAccountUsersAction(params?: AccountUsersPaginationParams) {
-  return safeServerAction(async () => {
-    const { users, total } = await accountService.listAccountUsers(params);
-    return { data: users, total };
-  });
-}
-
-export async function updateUserAction(user: UpdateAccountUserRequest) {
-  return safeServerAction(() => accountService.updateAccountUser(user));
-}
-
-export async function updateAccountUserByIdAction(
-  userId: number,
-  user: UpdateAccountUserRequest
-) {
-  return safeServerAction(() => accountService.updateAccountUserById(userId, user));
-}
-
-export async function updateAccountAction(data: UpdateAccountRequest) {
-  return safeServerAction(() => accountService.updateAccount(data));
-}
-
-export async function deleteAccountUserAction(userId: number) {
-  return safeServerAction(() => accountService.deleteAccountUser(userId));
-}
-
-export async function deleteAccountAction() {
-  return safeServerAction(() => accountService.deleteAccount());
-}
-
-export async function createAccountUserAction(user: CreateAccountUserRequest) {
-  return safeServerAction(() => accountService.createAccountUser(user));
-}
-
-export async function changePasswordAction(data: ChangePasswordRequest) {
-  return safeServerAction(() => accountService.changePassword(data));
-}
-
-export async function requestEmailChangeAction(newEmail: string) {
-  return safeServerAction(() => accountService.requestContactReset('email', newEmail));
-}
-
-export async function confirmEmailChangeAction(token: string, newEmail: string) {
-  return safeServerAction(() => accountService.confirmContactReset('email', token, newEmail));
-}
-
-export async function requestPhoneChangeAction(newPhone: string) {
-  return safeServerAction(() => accountService.requestContactReset('phone', newPhone));
-}
-
-export async function confirmPhoneChangeAction(token: string, newPhone: string) {
-  return safeServerAction(() => accountService.confirmContactReset('phone', token, newPhone));
-}
-
-export async function generateTwoFactorAction() {
-  return safeServerAction(async () => {
-    const result = await twoFactorService.generate();
-    return {
-      qrcode: result.data.qrcode,
-      backupCodes: result.data.backup_codes,
-    };
-  });
-}
-
-export async function confirmTwoFactorAction(code: string) {
-  return safeServerAction(async () => {
-    await twoFactorService.confirm(code);
-    await accountService.updateAccountUser({ two_factor_authentication: true });
-  });
-}
-
-export async function disableTwoFactorAction(code: string) {
-  return safeServerAction(async () => {
-    await twoFactorService.verify(code);
-    await twoFactorService.disable();
-  });
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { accountService } from '../services/account.service';
+import type {
+  AccountUsersPaginationParams,
+  ChangePasswordRequest,
+  CreateAccountUserRequest,
+  UpdateAccountRequest,
+  UpdateAccountUserRequest,
+} from '../types';
+import { twoFactorService } from '../services/two-factor.service';
+
+export async function listAccountUsersAction(params?: AccountUsersPaginationParams) {
+  return safeServerAction(async () => {
+    const { users, total } = await accountService.listAccountUsers(params);
+    return { data: users, total };
+  });
+}
+
+export async function updateUserAction(user: UpdateAccountUserRequest) {
+  return safeServerAction(() => accountService.updateAccountUser(user));
+}
+
+export async function updateAccountUserByIdAction(
+  userId: number,
+  user: UpdateAccountUserRequest
+) {
+  return safeServerAction(() => accountService.updateAccountUserById(userId, user));
+}
+
+export async function updateAccountAction(data: UpdateAccountRequest) {
+  return safeServerAction(() => accountService.updateAccount(data));
+}
+
+export async function deleteAccountUserAction(userId: number) {
+  return safeServerAction(() => accountService.deleteAccountUser(userId));
+}
+
+export async function deleteAccountAction() {
+  return safeServerAction(() => accountService.deleteAccount());
+}
+
+export async function createAccountUserAction(user: CreateAccountUserRequest) {
+  return safeServerAction(() => accountService.createAccountUser(user));
+}
+
+export async function changePasswordAction(data: ChangePasswordRequest) {
+  return safeServerAction(() => accountService.changePassword(data));
+}
+
+export async function requestEmailChangeAction(newEmail: string) {
+  return safeServerAction(() => accountService.requestContactReset('email', newEmail));
+}
+
+export async function confirmEmailChangeAction(token: string, newEmail: string) {
+  return safeServerAction(() => accountService.confirmContactReset('email', token, newEmail));
+}
+
+export async function requestPhoneChangeAction(newPhone: string) {
+  return safeServerAction(() => accountService.requestContactReset('phone', newPhone));
+}
+
+export async function confirmPhoneChangeAction(token: string, newPhone: string) {
+  return safeServerAction(() => accountService.confirmContactReset('phone', token, newPhone));
+}
+
+export async function generateTwoFactorAction() {
+  return safeServerAction(async () => {
+    const result = await twoFactorService.generate();
+    return {
+      qrcode: result.data.qrcode,
+      backupCodes: result.data.backup_codes,
+    };
+  });
+}
+
+export async function confirmTwoFactorAction(code: string) {
+  return safeServerAction(async () => {
+    await twoFactorService.confirm(code);
+    await accountService.updateAccountUser({ two_factor_authentication: true });
+  });
+}
+
+export async function disableTwoFactorAction(code: string) {
+  return safeServerAction(async () => {
+    await twoFactorService.verify(code);
+    await twoFactorService.disable();
+  });
+}

package/src/modules/accounts/actions/find-current-account.action.ts

@@ -1,9 +1,9 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { accountService } from '../services/account.service';
-import type { Account } from '../types';
-
-export async function findCurrentAccount() {
-  return safeServerAction<Account>(() => accountService.findCurrentAccount());
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { accountService } from '../services/account.service';
+import type { Account } from '../types';
+
+export async function findCurrentAccount() {
+  return safeServerAction<Account>(() => accountService.findCurrentAccount());
+}

package/src/modules/accounts/actions/list-currencies.action.ts

@@ -1,8 +1,8 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { currencyService } from '../services/currency.service';
-
-export async function listCurrenciesAction() {
-  return safeServerAction(() => currencyService.fetchOptions());
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { currencyService } from '../services/currency.service';
+
+export async function listCurrenciesAction() {
+  return safeServerAction(() => currencyService.fetchOptions());
+}

package/src/modules/accounts/actions/list-timezones.action.ts

@@ -1,8 +1,8 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { timezoneService } from '../services/timezone.service';
-
-export async function listTimezonesAction() {
-  return safeServerAction(() => timezoneService.fetchOptions());
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { timezoneService } from '../services/timezone.service';
+
+export async function listTimezonesAction() {
+  return safeServerAction(() => timezoneService.fetchOptions());
+}

package/src/modules/accounts/hooks/current-account.hook.tsx

@@ -1,22 +1,22 @@
-'use client';
-
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { findCurrentAccount } from '../actions/find-current-account.action';
-import { withAction } from '../../../utils/withAction';
-
-export const ACCOUNT_QUERY_KEY = ['account'];
-
-export function useCurrentAccount() {
-  return useQuery({
-    queryKey: ACCOUNT_QUERY_KEY,
-    queryFn: withAction(findCurrentAccount),
-    staleTime: 0,
-    gcTime: 10 * 60 * 1000,
-    retry: false,
-  });
-}
-
-export function useInvalidateAccount() {
-  const queryClient = useQueryClient();
-  return () => queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
-}
+'use client';
+
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { findCurrentAccount } from '../actions/find-current-account.action';
+import { withAction } from '../../../utils/withAction';
+
+export const ACCOUNT_QUERY_KEY = ['account'];
+
+export function useCurrentAccount() {
+  return useQuery({
+    queryKey: ACCOUNT_QUERY_KEY,
+    queryFn: withAction(findCurrentAccount),
+    staleTime: 0,
+    gcTime: 10 * 60 * 1000,
+    retry: false,
+  });
+}
+
+export function useInvalidateAccount() {
+  const queryClient = useQueryClient();
+  return () => queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
+}

package/src/modules/accounts/hooks/useAccountManagement.ts

@@ -1,85 +1,85 @@
-'use client';
-
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { USER_QUERY_KEY } from '../../auth/hooks/useUserQuery';
-import { ACCOUNT_QUERY_KEY } from './current-account.hook';
-import type {
-  UpdateAccountRequest,
-  UpdateAccountUserRequest,
-  DeleteAccountUserResponse,
-  DeleteAccountResponse,
-} from '../types';
-import {
-  updateUserAction,
-  updateAccountAction,
-  updateAccountUserByIdAction,
-  deleteAccountUserAction,
-  deleteAccountAction,
-} from '../actions/account-management.action';
-import { withAction } from '../../../utils/withAction';
-import type { UseMutationOptions } from '@tanstack/react-query';
-
-const ACCOUNT_USERS_QUERY_KEY = ['account-users'];
-
-export function useUpdateAccount() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(updateAccountAction),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-    },
-  });
-}
-
-export function useUpdateAccountUser() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(updateUserAction),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-    },
-  });
-}
-
-export function useUpdateAccountUserById() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(({ userId, ...user }: UpdateAccountUserRequest & { userId: number }) =>
-      updateAccountUserByIdAction(userId, user)
-    ),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-    },
-  });
-}
-
-export function useDeleteAccountUser(
-  options?: UseMutationOptions<DeleteAccountUserResponse, Error, number>
-) {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(deleteAccountUserAction),
-    ...options,
-    onSuccess: (...params) => {
-      options?.onSuccess?.(...params);
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-    },
-  });
-}
-
-export function useDeleteAccount(
-  options?: UseMutationOptions<DeleteAccountResponse, Error, void>
-) {
-  return useMutation({
-    mutationFn: withAction(deleteAccountAction),
-    ...options,
-  });
-}
+'use client';
+
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { USER_QUERY_KEY } from '../../auth/hooks/useUserQuery';
+import { ACCOUNT_QUERY_KEY } from './current-account.hook';
+import type {
+  UpdateAccountRequest,
+  UpdateAccountUserRequest,
+  DeleteAccountUserResponse,
+  DeleteAccountResponse,
+} from '../types';
+import {
+  updateUserAction,
+  updateAccountAction,
+  updateAccountUserByIdAction,
+  deleteAccountUserAction,
+  deleteAccountAction,
+} from '../actions/account-management.action';
+import { withAction } from '../../../utils/withAction';
+import type { UseMutationOptions } from '@tanstack/react-query';
+
+const ACCOUNT_USERS_QUERY_KEY = ['account-users'];
+
+export function useUpdateAccount() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(updateAccountAction),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
+    },
+  });
+}
+
+export function useUpdateAccountUser() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(updateUserAction),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
+    },
+  });
+}
+
+export function useUpdateAccountUserById() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(({ userId, ...user }: UpdateAccountUserRequest & { userId: number }) =>
+      updateAccountUserByIdAction(userId, user)
+    ),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+    },
+  });
+}
+
+export function useDeleteAccountUser(
+  options?: UseMutationOptions<DeleteAccountUserResponse, Error, number>
+) {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(deleteAccountUserAction),
+    ...options,
+    onSuccess: (...params) => {
+      options?.onSuccess?.(...params);
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+    },
+  });
+}
+
+export function useDeleteAccount(
+  options?: UseMutationOptions<DeleteAccountResponse, Error, void>
+) {
+  return useMutation({
+    mutationFn: withAction(deleteAccountAction),
+    ...options,
+  });
+}

package/src/modules/accounts/hooks/useCurrencies.ts

@@ -1,15 +1,15 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
-import { listCurrenciesAction } from '../actions/list-currencies.action';
-import { withAction } from '../../../utils/withAction';
-
-export const CURRENCIES_QUERY_KEY = ['currencies'];
-
-export function useCurrencies() {
-  return useQuery({
-    queryKey: CURRENCIES_QUERY_KEY,
-    queryFn: withAction(listCurrenciesAction),
-    staleTime: Infinity,
-  });
-}
+'use client';
+
+import { useQuery } from '@tanstack/react-query';
+import { listCurrenciesAction } from '../actions/list-currencies.action';
+import { withAction } from '../../../utils/withAction';
+
+export const CURRENCIES_QUERY_KEY = ['currencies'];
+
+export function useCurrencies() {
+  return useQuery({
+    queryKey: CURRENCIES_QUERY_KEY,
+    queryFn: withAction(listCurrenciesAction),
+    staleTime: Infinity,
+  });
+}

package/src/modules/accounts/hooks/useTimezones.ts

@@ -1,15 +1,15 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
-import { listTimezonesAction } from '../actions/list-timezones.action';
-import { withAction } from '../../../utils/withAction';
-
-export const TIMEZONES_QUERY_KEY = ['timezones'];
-
-export function useTimezones() {
-  return useQuery({
-    queryKey: TIMEZONES_QUERY_KEY,
-    queryFn: withAction(listTimezonesAction),
-    staleTime: Infinity,
-  });
-}
+'use client';
+
+import { useQuery } from '@tanstack/react-query';
+import { listTimezonesAction } from '../actions/list-timezones.action';
+import { withAction } from '../../../utils/withAction';
+
+export const TIMEZONES_QUERY_KEY = ['timezones'];
+
+export function useTimezones() {
+  return useQuery({
+    queryKey: TIMEZONES_QUERY_KEY,
+    queryFn: withAction(listTimezonesAction),
+    staleTime: Infinity,
+  });
+}

package/src/modules/auth/hooks/login.hook.tsx

@@ -1,17 +1,17 @@
-"use client";
-
-import { useMutation } from "@tanstack/react-query";
-import { loginAction } from "../actions/login.action";
-import { LoginRequest, LoginSuccessResponse } from "../schema";
-
-export function useLogin() {
-  return useMutation({
-    mutationFn: async (credentials: LoginRequest): Promise<LoginSuccessResponse> => {
-      const result = await loginAction(credentials);
-      if (!result.success) throw new Error(result.error ?? 'Erro desconhecido');
-      const data = result.data!;
-      if (data.result === 'error') throw new Error(data.message);
-      return data as LoginSuccessResponse;
-    },
-  });
-}
+"use client";
+
+import { useMutation } from "@tanstack/react-query";
+import { loginAction } from "../actions/login.action";
+import { LoginRequest, LoginSuccessResponse } from "../schema";
+
+export function useLogin() {
+  return useMutation({
+    mutationFn: async (credentials: LoginRequest): Promise<LoginSuccessResponse> => {
+      const result = await loginAction(credentials);
+      if (!result.success) throw new Error(result.error ?? 'Erro desconhecido');
+      const data = result.data!;
+      if (data.result === 'error') throw new Error(data.message);
+      return data as LoginSuccessResponse;
+    },
+  });
+}

package/src/modules/auth/hooks/logout.hook.tsx

@@ -1,11 +1,11 @@
-"use client";
-
-import { useMutation } from "@tanstack/react-query";
-import { logoutAction } from "../actions/logout.action";
-import { withAction } from "../../../utils/withAction";
-
-export function useLogout() {
-  return useMutation({
-    mutationFn: withAction(logoutAction),
-  });
-}
+"use client";
+
+import { useMutation } from "@tanstack/react-query";
+import { logoutAction } from "../actions/logout.action";
+import { withAction } from "../../../utils/withAction";
+
+export function useLogout() {
+  return useMutation({
+    mutationFn: withAction(logoutAction),
+  });
+}