From ec776b94ae3ba0fc40e2a841ece0be1e26c2fe82 Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Mon, 9 Jun 2025 21:57:01 +0800 Subject: [PATCH 1/2] fix: re-added merge user logic --- backend/src/services/user/user-service.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/services/user/user-service.ts b/backend/src/services/user/user-service.ts index aae32d91f..52eaeeea1 100644 --- a/backend/src/services/user/user-service.ts +++ b/backend/src/services/user/user-service.ts @@ -109,6 +109,12 @@ export const userServiceFactory = ({ await userDAL.updateById(user.id, { isEmailVerified: true }); + + if (usersByusername.length === 1 && user) { + await userDAL.updateById(user.id, { + username: user.email.toLowerCase() + }); + } }; const updateUserMfa = async ({ userId, isMfaEnabled, selectedMfaMethod }: TUpdateUserMfaDTO) => { From d5ee74bb1a123ea34eff2c5b78e9fae17a2fc9bb Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Mon, 9 Jun 2025 22:02:01 +0800 Subject: [PATCH 2/2] misc: simplified logic --- backend/src/services/user/user-service.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/backend/src/services/user/user-service.ts b/backend/src/services/user/user-service.ts index 52eaeeea1..39300fec5 100644 --- a/backend/src/services/user/user-service.ts +++ b/backend/src/services/user/user-service.ts @@ -107,14 +107,9 @@ export const userServiceFactory = ({ }); await userDAL.updateById(user.id, { - isEmailVerified: true + isEmailVerified: true, + username: usersByusername.length === 1 && user.email ? user.email.toLowerCase() : undefined }); - - if (usersByusername.length === 1 && user) { - await userDAL.updateById(user.id, { - username: user.email.toLowerCase() - }); - } }; const updateUserMfa = async ({ userId, isMfaEnabled, selectedMfaMethod }: TUpdateUserMfaDTO) => {