Merge pull request #8902 from torgeirl/develop

[NEW] Added support for Dataporten's userid-feide scope
RocketChat · Dec 8, 2017 · b444159 · b444159
2 parents 2f2f662 + 5be48fb
commit b444159
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
@@ -196,7 +196,11 @@ export class CustomOAuth {
 
 				// Fix Dataporten having 'user.userid' instead of 'id'
 				if (identity.user && identity.user.userid && !identity.id) {
-					identity.id = identity.user.userid;
+					if (identity.user.userid_sec && identity.user.userid_sec[0]) {
+						identity.id = identity.user.userid_sec[0];
+					} else {
+						identity.id = identity.user.userid;
+					}
 					identity.email = identity.user.email;
 				}
 				// Fix for Xenforo [BD]API plugin for 'user.user_id; instead of 'id'