Merge pull request #8968 from wesnspace/patch-2

[FIX] Xenforo [BD]API for 'user.user_id; instead of 'id'
RocketChat · Dec 4, 2017 · c6b7fb7 · c6b7fb7
2 parents b9f4f3e + 36e2e0d
commit c6b7fb7
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
@@ -194,7 +194,11 @@ export class CustomOAuth {
 					identity.id = identity.user.userid;
 					identity.email = identity.user.email;
 				}
-
+				// Fix for Xenforo [BD]API plugin for 'user.user_id; instead of 'id'
+				if (identity.user && identity.user.user_id && !identity.id) {
+					identity.id = identity.user.user_id;
+					identity.email = identity.user.user_email;
+				}
 				// Fix general 'phid' instead of 'id' from phabricator
 				if (identity.phid && !identity.id) {
 					identity.id = identity.phid;