Merge pull request #3385 from yuvipanda/fix-2

ucmerced: Show ucmerced login option before Google
2i2c-org · Nov 7, 2023 · f013e22 · f013e22
2 parents 6f0989f + b02ced5
commit f013e22
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/config/clusters/2i2c/ucmerced-common.values.yaml b/config/clusters/2i2c/ucmerced-common.values.yaml
@@ -19,18 +19,28 @@ jupyterhub:
           name: University of California, Merced
           url: http://www.ucmerced.edu/
   hub:
+    extraConfig:
+      100-cilogon-ordering: |
+        # Explicitly specify allowed_idps here, so their sort order is
+        # preserved. Otherwise, the keys get sorted lexicographically,
+        # and Google comes before UC Merced
+        # https://github.com/2i2c-org/infrastructure/issues/3267
+        c.CILogonOAuthenticator.allowed_idps = {
+          "urn:mace:incommon:ucmerced.edu": {
+            "username_derivation": {
+              "username_claim": "eppn"
+            },
+            "allow_all": True
+          },
+          "http://google.com/accounts/o8/id": {
+            "username_derivation": {
+              "username_claim": "email"
+            }
+          }
+        }
     config:
       JupyterHub:
         authenticator_class: cilogon
-      CILogonOAuthenticator:
-        allowed_idps:
-          urn:mace:incommon:ucmerced.edu:
-            username_derivation:
-              username_claim: "eppn"
-            allow_all: true
-          http://google.com/accounts/o8/id:
-            username_derivation:
-              username_claim: "email"
       Authenticator:
         admin_users:
           - schadalapaka@ucmerced.edu