Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

packages/rocketchat-custom-oauth/custom_oauth_server.coffee

@@ -122,16 +122,20 @@ class CustomOAuth
 
 			if identity?.CharacterID and not identity.id
 				identity.id = identity.CharacterID
-			
+
 			# Fix Dataporten having 'user.userid' instead of 'id'
 			if identity?.user?.userid and not identity.id
 				identity.id = identity.user.userid
 				identity.email = identity.user.email
-			
+
+			# Fix general 'phid' instead of 'id' from phabricator
+			if identity?.phid and not identity.id
+				identity.id = identity.phid
+
 			# Fix general 'userid' instead of 'id' from provider
 			if identity?.userid and not identity.id
 				identity.id = identity.userid
-				
+
 			# console.log 'id:', JSON.stringify identity, null, '  '
 
 			serviceData =
@@ -144,7 +148,7 @@ class CustomOAuth
 				serviceData: serviceData
 				options:
 					profile:
-						name: identity.name or identity.username or identity.nickname or identity.CharacterName or identity.user?.name
+						name: identity.name or identity.username or identity.nickname or identity.CharacterName or identity.userName or identity.user?.name
 
 			# console.log data