@greatapps/common 1.1.44 → 1.1.48

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

@@ -1,7 +1,7 @@
-'use server';
+"use server";
 
-import { accountService } from '../services/account.service';
-import { ApiError } from '../../../infra/api/types';
+import { accountService } from "../services/account.service";
+import { ApiError } from "../../../infra/api/types";
 import type {
   AccountUsersPaginationParams,
   AccountUsersActionResult,
@@ -17,8 +17,8 @@ import type {
   UpdateAccountRequest,
   UpdateAccountUserRequest,
   UpdateUserActionResult,
-} from '../types';
-import { twoFactorService } from '../services/two-factor.service';
+} from "../types";
+import { twoFactorService } from "../services/two-factor.service";
 
 export async function listAccountUsersAction(
   params?: AccountUsersPaginationParams
@@ -27,8 +27,12 @@ export async function listAccountUsersAction(
     const { users, total } = await accountService.listAccountUsers(params);
     return { success: true, data: users, total };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao listar usuários. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Erro ao listar usuários. Tente novamente.",
+    };
   }
 }
 
@@ -39,8 +43,12 @@ export async function updateUserAction(
     const result = await accountService.updateAccountUser(user);
     return { success: true, data: result };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao atualizar usuário. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Erro ao atualizar usuário. Tente novamente.",
+    };
   }
 }
 
@@ -52,8 +60,12 @@ export async function updateAccountUserByIdAction(
     const result = await accountService.updateAccountUserById(userId, user);
     return { success: true, data: result };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao atualizar usuário. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Erro ao atualizar usuário. Tente novamente.",
+    };
   }
 }
 
@@ -64,18 +76,28 @@ export async function updateAccountAction(
     await accountService.updateAccount(data);
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao atualizar conta. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Erro ao atualizar conta. Tente novamente.",
+    };
   }
 }
 
-export async function deleteAccountUserAction(userId: number): Promise<DeleteUserActionResult> {
+export async function deleteAccountUserAction(
+  userId: number
+): Promise<DeleteUserActionResult> {
   try {
     await accountService.deleteAccountUser(userId);
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao remover usuário. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Erro ao remover usuário. Tente novamente.",
+    };
   }
 }
 
@@ -84,8 +106,9 @@ export async function deleteAccountAction(): Promise<DeleteAccountActionResult>
     await accountService.deleteAccount();
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao excluir conta. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return { success: false, error: "Erro ao excluir conta. Tente novamente." };
   }
 }
 
@@ -96,8 +119,9 @@ export async function createAccountUserAction(
     const result = await accountService.createAccountUser(user);
     return { success: true, data: result.data };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao criar usuário. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return { success: false, error: "Erro ao criar usuário. Tente novamente." };
   }
 }
 
@@ -108,18 +132,26 @@ export async function changePasswordAction(
     await accountService.changePassword(data);
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao alterar senha. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return { success: false, error: "Erro ao alterar senha. Tente novamente." };
   }
 }
 
-export async function requestEmailChangeAction(newEmail: string): Promise<ContactResetResult> {
+export async function requestEmailChangeAction(
+  newEmail: string
+): Promise<ContactResetResult> {
   try {
-    await accountService.requestContactReset('email', newEmail);
+    await accountService.requestContactReset("email", newEmail);
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'E-mail já existente ou ocorreu um erro. Tente novamente mais tarde.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error:
+        "E-mail já existente ou ocorreu um erro. Tente novamente mais tarde.",
+    };
   }
 }
 
@@ -128,21 +160,32 @@ export async function confirmEmailChangeAction(
   newEmail: string
 ): Promise<ContactResetResult> {
   try {
-    await accountService.confirmContactReset('email', token, newEmail);
+    await accountService.confirmContactReset("email", token, newEmail);
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Código inválido ou expirado. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Código inválido ou expirado. Tente novamente.",
+    };
   }
 }
 
-export async function requestPhoneChangeAction(newPhone: string): Promise<ContactResetResult> {
+export async function requestPhoneChangeAction(
+  newPhone: string
+): Promise<ContactResetResult> {
   try {
-    await accountService.requestContactReset('phone', newPhone);
+    await accountService.requestContactReset("phone", newPhone);
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Número já existente ou ocorreu um erro. Tente novamente mais tarde.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error:
+        "Número já existente ou ocorreu um erro. Tente novamente mais tarde.",
+    };
   }
 }
 
@@ -151,47 +194,68 @@ export async function confirmPhoneChangeAction(
   newPhone: string
 ): Promise<ContactResetResult> {
   try {
-    await accountService.confirmContactReset('phone', token, newPhone);
+    await accountService.confirmContactReset("phone", token, newPhone);
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Código inválido ou expirado. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Código inválido ou expirado. Tente novamente.",
+    };
   }
 }
 
 export async function generateTwoFactorAction(): Promise<TwoFactorGenerateResult> {
   try {
     const result = await twoFactorService.generate();
-    return { success: true, qrcode: result.data.qrcode, backupCodes: result.data.backup_codes };
+    return {
+      success: true,
+      qrcode: result.data.qrcode,
+      backupCodes: result.data.backup_codes,
+    };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao gerar QR Code. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return { success: false, error: "Erro ao gerar QR Code. Tente novamente." };
   }
 }
 
-export async function confirmTwoFactorAction(code: string): Promise<TwoFactorActionResult> {
+export async function confirmTwoFactorAction(
+  code: string
+): Promise<TwoFactorActionResult> {
   try {
     await twoFactorService.confirm(code);
-    return { success: true };
+    await accountService.updateAccountUser({ two_factor_authentication: true });
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Código inválido. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return { success: false, error: "Código inválido. Tente novamente." };
   }
+
+  return { success: true };
 }
 
-export async function disableTwoFactorAction(code: string): Promise<TwoFactorActionResult> {
+export async function disableTwoFactorAction(
+  code: string
+): Promise<TwoFactorActionResult> {
   try {
     await twoFactorService.verify(code);
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Código inválido. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return { success: false, error: "Código inválido. Tente novamente." };
   }
 
   try {
     await twoFactorService.disable();
     return { success: true };
   } catch (error) {
-    if (error instanceof ApiError) return { success: false, error: error.message };
-    return { success: false, error: 'Erro ao desabilitar 2FA. Tente novamente.' };
+    if (error instanceof ApiError)
+      return { success: false, error: error.message };
+    return {
+      success: false,
+      error: "Erro ao desabilitar 2FA. Tente novamente.",
+    };
   }
 }

package/src/modules/accounts/types.ts

@@ -108,6 +108,7 @@ export interface UpdateAccountUserRequest {
     receive_email?: boolean;
     photo?: File | string | null;
     projects?: number[];
+    two_factor_authentication?: boolean;
 }
 
 export interface UpdateAccountUserResponse {

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

@@ -0,0 +1,8 @@
+'use server';
+
+import { projectUsersService } from '../services/project-users.service';
+import type { AddRemoveProjectUsersParams } from '../types';
+
+export async function addProjectUserAction(params: AddRemoveProjectUsersParams): Promise<void> {
+  return projectUsersService.addToProject(params);
+}

package/src/modules/projects/actions/list-available-users.action.ts

@@ -0,0 +1,8 @@
+'use server';
+
+import { projectUsersService } from '../services/project-users.service';
+import type { AccountUser } from '../types';
+
+export async function listAvailableUsersAction(id_project: number): Promise<AccountUser[]> {
+  return projectUsersService.listNotInProject(id_project);
+}

package/src/modules/projects/actions/list-project-users.action.ts

@@ -0,0 +1,8 @@
+'use server';
+
+import { projectUsersService } from '../services/project-users.service';
+import type { ProjectUser } from '../types';
+
+export async function listProjectUsersAction(id_project: number): Promise<ProjectUser[]> {
+  return projectUsersService.listInProject(id_project);
+}

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

@@ -0,0 +1,8 @@
+'use server';
+
+import { projectUsersService } from '../services/project-users.service';
+import type { AddRemoveProjectUsersParams } from '../types';
+
+export async function removeProjectUserAction(params: AddRemoveProjectUsersParams): Promise<void> {
+  return projectUsersService.removeFromProject(params);
+}

package/src/modules/projects/hooks/project-users.hook.ts

@@ -0,0 +1,81 @@
+'use client';
+
+import { useMemo } from 'react';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+
+import type { UserSelectorItem } from '../../../components/layouts/UsersSelectorPopover';
+import { addProjectUserAction } from '../actions/add-project-user.action';
+import { listAvailableUsersAction } from '../actions/list-available-users.action';
+import { listProjectUsersAction } from '../actions/list-project-users.action';
+import { removeProjectUserAction } from '../actions/remove-project-user.action';
+
+const DEFAULT_AVATAR = '/images/Logomark.png';
+
+export const projectUsersQueryKey = (id_project: number) => ['project-users', id_project];
+
+export function useProjectUsers(id_project: number) {
+  const queryClient = useQueryClient();
+
+  const { data: inProject = [], isLoading: isLoadingIn } = useQuery({
+    queryKey: [...projectUsersQueryKey(id_project), 'in'],
+    queryFn: () => listProjectUsersAction(id_project),
+    enabled: !!id_project,
+  });
+
+  const { data: notInProject = [], isLoading: isLoadingOut } = useQuery({
+    queryKey: [...projectUsersQueryKey(id_project), 'out'],
+    queryFn: () => listAvailableUsersAction(id_project),
+    enabled: !!id_project,
+  });
+
+  const invalidate = () => {
+    queryClient.invalidateQueries({ queryKey: projectUsersQueryKey(id_project) });
+  };
+
+  const addMutation = useMutation({
+    mutationFn: (user_id: number) =>
+      addProjectUserAction({ id_project, users: [user_id] }),
+    onSuccess: invalidate,
+  });
+
+  const removeMutation = useMutation({
+    mutationFn: (user_id: number) =>
+      removeProjectUserAction({ id_project, users: [user_id] }),
+    onSuccess: invalidate,
+  });
+
+  const users: UserSelectorItem[] = useMemo(
+    () => [
+      ...inProject.map((u) => ({
+        id: u.id_user,
+        name: u.name,
+        avatar: u.photo ?? DEFAULT_AVATAR,
+        checked: true,
+      })),
+      ...notInProject.map((u) => ({
+        id: u.id,
+        name: u.name,
+        avatar: u.photo ?? DEFAULT_AVATAR,
+        checked: false,
+      })),
+    ],
+    [inProject, notInProject]
+  );
+
+  const toggleUser = (id: number) => {
+    const user = users.find((u) => u.id === id);
+    if (!user) return;
+    if (user.checked) {
+      removeMutation.mutate(id);
+    } else {
+      addMutation.mutate(id);
+    }
+  };
+
+  return {
+    users,
+    isLoading: isLoadingIn || isLoadingOut,
+    userCount: inProject.length,
+    toggleUser,
+  };
+}

package/src/modules/projects/services/project-users.service.ts

@@ -0,0 +1,94 @@
+import 'server-only';
+
+import { api } from '../../../infra/api/client';
+import { ApiError } from '../../../infra/api/types';
+import { getUserContext } from '../../auth/utils/get-user-context';
+import {
+  AccountUser,
+  AccountUserSchema,
+  AddRemoveProjectUsersParams,
+  ProjectUser,
+  ProjectUserSchema,
+} from '../types';
+
+interface ApiListResponse<T> {
+  data: T[];
+  total: number;
+  status: number;
+  message?: string;
+}
+
+interface ApiActionResponse {
+  status: number;
+  message?: string;
+}
+
+class ProjectUsersService {
+  async listInProject(id_project: number): Promise<ProjectUser[]> {
+    const { id_account, id_user } = await getUserContext();
+    const url = `/account/${id_account}/user/${id_user}/projects/${id_project}/users`;
+
+    const response = await api.pages.get<ApiListResponse<ProjectUser>>(url);
+
+    if (response.status === 0) {
+      throw new ApiError(
+        response.message || 'Erro ao listar usuários do projeto',
+        'LIST_PROJECT_USERS_FAILED',
+        400
+      );
+    }
+
+    return response.data.map((item) => ProjectUserSchema.parse(item));
+  }
+
+  async listNotInProject(id_project: number): Promise<AccountUser[]> {
+    const { id_account } = await getUserContext();
+    const url = `/accounts/${id_account}/users?notInProject=${id_project}`;
+
+    const response = await api.apps.get<ApiListResponse<AccountUser>>(url);
+
+    if (response.status === 0) {
+      throw new ApiError(
+        response.message || 'Erro ao listar usuários disponíveis',
+        'LIST_AVAILABLE_USERS_FAILED',
+        400
+      );
+    }
+
+    return response.data.map((item) => AccountUserSchema.parse(item));
+  }
+
+  async addToProject({ id_project, users }: AddRemoveProjectUsersParams): Promise<void> {
+    const { id_account, id_user } = await getUserContext();
+    const url = `/account/${id_account}/user/${id_user}/projects/${id_project}/users`;
+
+    const response = await api.pages.post<ApiActionResponse>(url, { users });
+
+    if (response.status === 0) {
+      throw new ApiError(
+        response.message || 'Erro ao adicionar usuário ao projeto',
+        'ADD_PROJECT_USER_FAILED',
+        400
+      );
+    }
+  }
+
+  async removeFromProject({ id_project, users }: AddRemoveProjectUsersParams): Promise<void> {
+    const { id_account, id_user } = await getUserContext();
+    const url = `/account/${id_account}/user/${id_user}/projects/${id_project}/users`;
+
+    const response = await api.pages.delete<ApiActionResponse>(url, {
+      body: JSON.stringify({ users }),
+    });
+
+    if (response.status === 0) {
+      throw new ApiError(
+        response.message || 'Erro ao remover usuário do projeto',
+        'REMOVE_PROJECT_USER_FAILED',
+        400
+      );
+    }
+  }
+}
+
+export const projectUsersService = new ProjectUsersService();

package/src/modules/projects/types.ts

@@ -0,0 +1,28 @@
+import { z } from 'zod';
+
+export const ProjectUserSchema = z.object({
+  id_user: z.union([z.number(), z.string()]).transform(Number),
+  id_account: z.union([z.number(), z.string()]).transform(Number),
+  id_project: z.union([z.number(), z.string()]).transform(Number),
+  name: z.string(),
+  email: z.string(),
+  profile: z.string().optional(),
+  photo: z.string().nullable().optional(),
+});
+
+export type ProjectUser = z.infer<typeof ProjectUserSchema>;
+
+export const AccountUserSchema = z.object({
+  id: z.union([z.number(), z.string()]).transform(Number),
+  name: z.string(),
+  email: z.string(),
+  profile: z.string().optional(),
+  photo: z.string().nullable().optional(),
+});
+
+export type AccountUser = z.infer<typeof AccountUserSchema>;
+
+export interface AddRemoveProjectUsersParams {
+  id_project: number;
+  users: number[];
+}

package/src/server.ts

@@ -15,6 +15,13 @@ export { validateSessionAction } from './modules/auth/actions/validate-session.a
 export { listSubscriptionsAction } from './modules/subscriptions/actions/list-subscriptions.action';
 export { listIaCreditsAction } from './modules/ia-credits/actions/list-ia-credits.action';
 
+// Project Users Services & Actions (server-only)
+export { projectUsersService } from './modules/projects/services/project-users.service';
+export { listProjectUsersAction } from './modules/projects/actions/list-project-users.action';
+export { listAvailableUsersAction } from './modules/projects/actions/list-available-users.action';
+export { addProjectUserAction } from './modules/projects/actions/add-project-user.action';
+export { removeProjectUserAction } from './modules/projects/actions/remove-project-user.action';
+
 // Account Services & Actions (server-only)
 export { accountService } from './modules/accounts/services/account.service';
 export { twoFactorService } from './modules/accounts/services/two-factor.service';