Skip to content

Commit

Permalink
Merge pull request 2i2c-org#3816 from GeorgianaElena/rm-earthscope-ci…
Browse files Browse the repository at this point in the history
…logon-fix

[Support: Earthscope] Remove authentication special casing
  • Loading branch information
GeorgianaElena authored Mar 20, 2024
2 parents 317c414 + 9437c7b commit 7753be4
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions config/clusters/earthscope/common.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ basehub:
templateVars:
org:
url: https://www.earthscope.org/
logo_url: https://drive.google.com/uc?export=view&id=1UUStqv7PBcxiIkzECUFKIdQKKIU8mXeb
logo_url: https://github.com/2i2c-org/infrastructure/assets/7579677/589da909-86c2-4440-a42b-e3f1b59f49d5
designed_by:
name: "2i2c"
url: https://2i2c.org
Expand Down Expand Up @@ -82,18 +82,6 @@ basehub:
url = f"{url}?{params}"
return url
async def authenticate(self, *args, **kwargs):
auth_model = await super().authenticate(*args, **kwargs)
username = auth_model["name"]
# This is required until https://github.com/jupyterhub/oauthenticator/pull/717
# gets merged, can be removed after that.
if username.startswith("oauth2|cilogon"):
cilogon_sub = username.rsplit("|", 1)[-1]
cilogon_sub_parts = cilogon_sub.split("/")
username = f"oauth2|cilogon|{cilogon_sub_parts[3]}|{cilogon_sub_parts[5]}"
auth_model["name"] = username
return auth_model
async def check_allowed(self, username, auth_model):
if await super().check_allowed(username, auth_model):
return True
Expand Down

0 comments on commit 7753be4

Please sign in to comment.