Return User email in userinfo endpoint (medplum#5907)

* Return User email in userinfo endpoint * PR feedback
neelyx-labworks · Feb 4, 2025 · ecdb47f · ecdb47f
1 parent ecd221b
commit ecdb47f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/packages/server/src/oauth/userinfo.ts b/packages/server/src/oauth/userinfo.ts
@@ -70,10 +70,15 @@ function buildProfile(userInfo: Record<string, any>, profile: ProfileResource):
 }
 
 function buildEmail(userInfo: Record<string, any>, profile: ProfileResource, user: User): void {
-  const contactPoint = profile.telecom?.find((cp) => cp.system === 'email');
-  if (contactPoint) {
-    userInfo.email = contactPoint.value;
-    userInfo.email_verified = !!(userInfo.email === user.email && user.emailVerified);
+  if (user.email) {
+    userInfo.email = user.email;
+    userInfo.email_verified = Boolean(user.emailVerified);
+  } else {
+    const contactPoint = profile.telecom?.find((cp) => cp.system === 'email');
+    if (contactPoint) {
+      userInfo.email = contactPoint.value;
+      userInfo.email_verified = false;
+    }
   }
 }