From b02ced5e52e4bfb8451518d1c662432fac56b75d Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 7 Nov 2023 19:26:14 +0530 Subject: [PATCH] ucmerced: Show ucmerced login option before Google Temporary but not particularly hacky fix, until https://github.com/jupyterhub/oauthenticator/issues/690 Ref https://github.com/2i2c-org/infrastructure/issues/3267 --- .../clusters/2i2c/ucmerced-common.values.yaml | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/config/clusters/2i2c/ucmerced-common.values.yaml b/config/clusters/2i2c/ucmerced-common.values.yaml index cd81360086..bed6bf9c3d 100644 --- 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