Merge eb10510 into 423e1f2

fence/resources/openid/ras_oauth2.py

@@ -151,7 +151,7 @@ def get_encoded_visas_v11_userinfo(self, userinfo, pkey_cache=None):
 
     def get_user_id(self, code):
 
-        err_msg = "Can't get user's info"
+        err_msg = "Unable to parse UserID from RAS userinfo response"
 
         try:
             token_endpoint = self.get_value_from_discovery_doc("token_endpoint", "")
@@ -179,15 +179,6 @@ def get_user_id(self, code):
             if userinfo.get("UserID"):
                 username = userinfo["UserID"]
                 field_name = "UserID"
-            elif userinfo.get("userid"):
-                username = userinfo["userid"]
-                field_name = "userid"
-            elif userinfo.get("preferred_username"):
-                username = userinfo["preferred_username"]
-                field_name = "preferred_username"
-            elif claims.get("sub"):
-                username = claims["sub"]
-                field_name = "sub"
             if not username:
                 self.logger.error(
                     "{}, received claims: {} and userinfo: {}".format(