Merge pull request #250 from emrysal/hotfix/username-taken-always-thrown

calcom · Jun 9, 2021 · 4448175 · 4448175 · vercel · Jun 9, 2021
2 parents 28eec8e + f24ca5b
commit 4448175
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pages/api/user/profile.ts b/pages/api/user/profile.ts
@@ -25,7 +25,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
   const username = req.body.username;
   // username is changed: username is optional but it is necessary to be unique, enforce here
-  if (username !== user.username) {
+  if (username !== session.user.username) {
     const userConflict = await prisma.user.findFirst({
       where: {
         username,

diff --git a/pages/settings/profile.tsx b/pages/settings/profile.tsx
@@ -58,7 +58,10 @@ export default function Settings(props) {
             headers: {
                 'Content-Type': 'application/json'
             }
-        }).then(handleError).then( () => setSuccessModalOpen(true) ).catch( (err) => {
+        }).then(handleError).then( () => {
+          setSuccessModalOpen(true);
+          setHasErrors(false); // dismiss any open errors
+        }).catch( (err) => {
           setHasErrors(true);
           setErrorMessage(err.message);
         });