From ee80577cc3d9648de8599d9c950bfad0527224e6 Mon Sep 17 00:00:00 2001
From: Somay Chauhan <somaychauhan98@gmail.com>
Date: Tue, 12 Mar 2024 21:07:53 +0530
Subject: [PATCH] fix: username inconsistency (#14034)

* fix: username inconsistency

* added comment

* code refactor
---
 .../server/routers/loggedInViewer/updateProfile.handler.ts     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/trpc/server/routers/loggedInViewer/updateProfile.handler.ts b/packages/trpc/server/routers/loggedInViewer/updateProfile.handler.ts
index 18c86766cf..87519a78ab 100644
--- a/packages/trpc/server/routers/loggedInViewer/updateProfile.handler.ts
+++ b/packages/trpc/server/routers/loggedInViewer/updateProfile.handler.ts
@@ -104,6 +104,9 @@ export const updateProfileHandler = async ({ ctx, input }: UpdateProfileOptions)
         throw new TRPCError({ code: "BAD_REQUEST", message: t("username_already_taken") });
       }
     }
+  } else if (input.username && user.organizationId && user.movedToProfileId) {
+    // don't change user.username if we have profile.username
+    delete data.username;
   }
 
   if (isPremiumUsername) {