Merge pull request #798 from uc-cdis/fix/ras/username

(fix) RAS perefer UserID
uc-cdis · Jul 17, 2020 · b70cc0f · b70cc0f
2 parents 5128b8c + bf696a8
commit b70cc0f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/fence/resources/openid/ras_oauth2.py b/fence/resources/openid/ras_oauth2.py
@@ -74,10 +74,10 @@ def get_user_id(self, code):
             return {"error": err_msg}
 
         username = None
-        if userinfo.get("preferred_username"):
-            username = userinfo["preferred_username"]
-        elif userinfo.get("UserID"):
+        if userinfo.get("UserID"):
             username = userinfo["UserID"]
+        elif userinfo.get("preferred_username"):
+            username = userinfo["preferred_username"]
         elif claims.get("sub"):
             username = claims["sub"]
         if not username: