Continue merge user

frontend/src/hooks/api/users/index.tsx

@@ -1,11 +1,12 @@
 export {
   useAddUserToWsE2EE,
   useAddUserToWsNonE2EE,
+  useMergeUsers,
   useSendEmailVerificationCode,
-  useVerifyEmailVerificationCode
-} from "./mutation";
+  useVerifyEmailVerificationCode} from "./mutation";
 export {
   fetchOrgUsers,
+  fetchUsersWithMyEmail,
   useAddUserToOrg,
   useCreateAPIKey,
   useDeleteAPIKey,
@@ -19,10 +20,10 @@ export {
   useGetOrgUsers,
   useGetUser,
   useGetUserAction,
+  useListUsersWithMyEmail,
   useLogoutUser,
   useRegisterUserAction,
   useRevokeMySessions,
   useUpdateMfaEnabled,
   useUpdateOrgUserRole,
-  useUpdateUserAuthMethods
-} from "./queries";
+  useUpdateUserAuthMethods} from "./queries";

frontend/src/hooks/api/users/mutation.tsx

@@ -7,7 +7,8 @@ import {
 import { apiRequest } from "@app/config/request";
 
 import { workspaceKeys } from "../workspace/queries";
-import { AddUserToWsDTOE2EE, AddUserToWsDTONonE2EE } from "./types";
+import { userKeys } from "./queries";
+import { AddUserToWsDTOE2EE, AddUserToWsDTONonE2EE, User } from "./types";
 
 export const useAddUserToWsE2EE = () => {
   const queryClient = useQueryClient();
@@ -72,12 +73,27 @@ export const useSendEmailVerificationCode = () => {
 };
 
 export const useVerifyEmailVerificationCode = () => {
+  const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({ code }: { code: string }) => {
       await apiRequest.post("/api/v2/users/me/emails/verify", {
         code
       });
       return {};
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries(userKeys.usersWithMyEmail);
+    }
+  });
+};
+
+export const useMergeUsers = () => {
+  return useMutation({
+    mutationFn: async ({ username }: { username: string }) => {
+      const { data } = await apiRequest.post<{ user: User }>("/api/v2/users/me/users/merge-user", {
+        username
+      });
+      return data;
     }
   });
 };

frontend/src/hooks/api/users/queries.tsx

@@ -26,7 +26,8 @@ export const userKeys = {
   myAPIKeys: ["api-keys"] as const,
   myAPIKeysV2: ["api-keys-v2"] as const,
   mySessions: ["sessions"] as const,
-  myOrganizationProjects: (orgId: string) => [{ orgId }, "organization-projects"] as const
+  myOrganizationProjects: (orgId: string) => [{ orgId }, "organization-projects"] as const,
+  usersWithMyEmail: ["users-with-my-email"] as const
 };
 
 export const fetchUserDetails = async () => {
@@ -351,3 +352,20 @@ export const useGetMyOrganizationProjects = (orgId: string) => {
     enabled: true
   });
 };
+
+export const fetchUsersWithMyEmail = async () => {
+  const {
+    data: { users }
+  } = await apiRequest.get<{ users: User[] }>("/api/v2/users/me/users/same-email");
+  return users;
+};
+
+export const useListUsersWithMyEmail = () => {
+  return useQuery({
+    queryKey: userKeys.usersWithMyEmail,
+    queryFn: async () => {
+      return fetchUsersWithMyEmail();
+    },
+    enabled: true
+  });
+};