Merge pull request #9044 from RocketChat/fix/rocketchat-oauth-rocketchat

[FIX] Can't use OAuth login against a Rocket.Chat OAuth server
RocketChat · Dec 8, 2017 · 0ee6410 · 0ee6410
2 parents d4a65a9 + 10972da
commit 0ee6410
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
@@ -213,6 +213,11 @@ export class CustomOAuth {
 				if (identity.userid && !identity.id) {
 					identity.id = identity.userid;
 				}
+
+				// Fix when authenticating from a meteor app with 'emails' field
+				if (!identity.email && (identity.emails && Array.isArray(identity.emails) && identity.emails.length >= 1)) {
+					identity.email = identity.emails[0].address ? identity.emails[0].address : undefined;
+				}
 			}
 
 			// console.log 'id:', JSON.stringify identity, null, '  '