Merge pull request 2i2c-org#3057 from sean-morris/master

[CloudBank] SJECCD Auth(SJCC and EVC) to Microsoft
norlandrhagen · Aug 30, 2023 · 2258d2c · 2258d2c
2 parents 52b004f + 025fb25
commit 2258d2c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/config/clusters/cloudbank/evc.values.yaml b/config/clusters/cloudbank/evc.values.yaml
@@ -34,14 +34,16 @@ jupyterhub:
       CILogonOAuthenticator:
         oauth_callback_url: https://evc.cloudbank.2i2c.cloud/hub/oauth_callback
         shown_idps:
-          - https://sso.sjeccd.edu
+          - http://login.microsoftonline.com/common/oauth2/v2.0/authorize
           - http://google.com/accounts/o8/id
           - urn:mace:incommon:berkeley.edu
         allowed_idps:
-          https://sso.sjeccd.edu:
+          http://login.microsoftonline.com/common/oauth2/v2.0/authorize:
             username_derivation:
               username_claim: "email"
             allowed_domains:
+              - "sjcc.edu"
+              - "stu.sjcc.edu"
               - "stu.evc.edu"
               - "evc.edu"
           http://google.com/accounts/o8/id:
@@ -50,10 +52,6 @@ jupyterhub:
             allowed_domains:
               - "2i2c.org"
               - "berkeley.edu"
-              - "sjcc.edu"
-              - "stu.sjcc.edu"
-              - "stu.evc.edu"
-              - "evc.edu"
           urn:mace:incommon:berkeley.edu:
             username_derivation:
               username_claim: "email"

diff --git a/config/clusters/cloudbank/sjcc.values.yaml b/config/clusters/cloudbank/sjcc.values.yaml
@@ -30,19 +30,24 @@ jupyterhub:
       CILogonOAuthenticator:
         oauth_callback_url: https://sjcc.cloudbank.2i2c.cloud/hub/oauth_callback
         shown_idps:
+          - http://login.microsoftonline.com/common/oauth2/v2.0/authorize:
           - http://google.com/accounts/o8/id
           - urn:mace:incommon:berkeley.edu
         allowed_idps:
-          http://google.com/accounts/o8/id:
+          http://login.microsoftonline.com/common/oauth2/v2.0/authorize:
             username_derivation:
               username_claim: "email"
             allowed_domains:
-              - "2i2c.org"
-              - "berkeley.edu"
               - "sjcc.edu"
-              - "stu.evc.edu"
               - "stu.sjcc.edu"
+              - "stu.evc.edu"
               - "evc.edu"
+          http://google.com/accounts/o8/id:
+            username_derivation:
+              username_claim: "email"
+            allowed_domains:
+              - "2i2c.org"
+              - "berkeley.edu"
           urn:mace:incommon:berkeley.edu:
             username_derivation:
               username_claim: "email"