Revert "To Hold"

This reverts commit 762afd9.

fence/config-default.yaml

@@ -184,11 +184,6 @@ OPENID_CONNECT:
     client_secret: ''
     redirect_url: '{{BASE_URL}}/login/ras/callback'
     scope: 'openid email profile ga4gh_passport_v1'
-    idp_config:
-      login_gov:
-        ras_idp_id: 'login.gov'
-        user_id_field: 'email'
-
 #    multifactor_auth_claim_info:
 #      claim: 'acr'
 #      values: [ 'https://stsstg.nih.gov/assurance/aal/2' ]

fence/resources/openid/ras_oauth2.py

@@ -146,24 +146,13 @@ def get_auth_info(self, code):
                 "Received RAS access token with txn: {}".format(at_claims.get("txn"))
             )
 
-            ras_idp_id = userinfo.get("preferred_username").split("@")[1]
-            field_name = None
-            for idp_config in (
-                config["OPENID_CONNECT"]["ras"].get("idp_config", {}).values()
-            ):
-                if idp_config.get("ras_idp_id") == ras_idp_id:
-                    field_name = idp_config.get("user_id_field")
-                    self.logger.info(
-                        f"{ras_idp_id} is configured to use {field_name} as the username."
-                    )
-
-            if not field_name:
-                if userinfo.get("UserID"):
-                    field_name = "UserID"
-                elif userinfo.get("userid"):
-                    field_name = "userid"
-
-            username = userinfo.get(field_name)
+            username = None
+            if userinfo.get("UserID"):
+                username = userinfo["UserID"]
+                field_name = "UserID"
+            elif userinfo.get("userid"):
+                username = userinfo["userid"]
+                field_name = "userid"
             if not username:
                 self.logger.error(
                     "{}, received claims: {} and userinfo: {}".format(