From 9f3bc6e395c1ad400566176e3f3ec84ac79994bc Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Fri, 12 Jan 2024 10:26:03 +0100 Subject: [PATCH] Try old code again --- jupyter/base/values/values.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jupyter/base/values/values.yaml b/jupyter/base/values/values.yaml index d2880d0..6c80d93 100644 --- a/jupyter/base/values/values.yaml +++ b/jupyter/base/values/values.yaml @@ -11,17 +11,16 @@ hub: storageClassName: csi-sc-cinderplugin extraConfig: oauthCode: | - c.JupyterHub.authenticator_class = "generic-oauth" + from oauthenticator.generic import GenericOAuthenticator + c.JupyterHub.authenticator_class = GenericOAuthenticator c.GenericOAuthenticator.client_id = os.environ['NEXTCLOUD_CLIENT_ID'] c.GenericOAuthenticator.client_secret = os.environ['NEXTCLOUD_CLIENT_SECRET'] c.GenericOAuthenticator.login_service = 'Sunet Drive' - c.GenericOAuthenticator.username_claim = lambda r: r.get('ocs', {}).get('data', {}).get('id') c.GenericOAuthenticator.username_key = lambda r: r.get('ocs', {}).get('data', {}).get('id') - + c.GenericOAuthenticator.userdata_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/ocs/v2.php/cloud/user?format=json' c.GenericOAuthenticator.authorize_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/authorize' c.GenericOAuthenticator.token_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/api/v1/token' - c.GenericOAuthenticator.userdata_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/ocs/v2.php/cloud/user?format=json' - # c.GenericOAuthenticator.oauth_callback_url = 'https://' + os.environ['JUPYTER_HOST'] + '/hub/oauth_callback' + c.GenericOAuthenticator.oauth_callback_url = 'https://' + os.environ['JUPYTER_HOST'] + '/hub/oauth_callback' extraEnv: NEXTCLOUD_HOST: sunet.drive.test.sunet.se