fix: handle existing oAuth client ID in user email to prevent duplication (calcom#22021)

ibex088 · web-flow · commit 6983179b2fef · 2025-06-26T08:29:29.000Z
* fix: handle existing oAuth client ID in user email to prevent duplication

* fix: update OAuth user email validation
diff --git a/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts b/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts
@@ -144,6 +144,9 @@ export class OAuthClientUsersService {
   }
 
   static getOAuthUserEmail(oAuthClientId: string, userEmail: string) {
+    if (userEmail.includes(`+${oAuthClientId}@`)) {
+      return userEmail;
+    }
     const [username, emailDomain] = userEmail.split("@");
     return `${username}+${oAuthClientId}@${emailDomain}`;
   }

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,9 @@ export class OAuthClientUsersService {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`static getOAuthUserEmail(oAuthClientId: string, userEmail: string) {`
	`147`	+ if (userEmail.includes(`+${oAuthClientId}@`)) {
	`148`	`+ return userEmail;`
	`149`	`+ }`
`147`	`150`	`const [username, emailDomain] = userEmail.split("@");`
`148`	`151`	return `${username}+${oAuthClientId}@${emailDomain}`;
`149`	`152`	`}`