From d790197e19c35ca97f9a9ab2de1ebbe202faf9cb Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Mon, 15 Jan 2024 14:28:39 +0100 Subject: [PATCH] Only define token_url once --- jupyter/base/values/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jupyter/base/values/values.yaml b/jupyter/base/values/values.yaml index d4f361a..f4ac5fb 100644 --- a/jupyter/base/values/values.yaml +++ b/jupyter/base/values/values.yaml @@ -15,13 +15,13 @@ hub: import requests from datetime import datetime from oauthenticator.generic import GenericOAuthenticator + token_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/api/v1/token' def get_nextcloud_access_token(refresh_token): debug = 'NEXTCLOUD_DEBUG_OAUTH' in os.environ client_id = os.environ['NEXTCLOUD_CLIENT_ID'] client_secret = os.environ['NEXTCLOUD_CLIENT_SECRET'] - url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/api/v1/token' code = refresh_token data = { 'grant_type': 'refresh_token', @@ -30,7 +30,7 @@ hub: 'client_id': client_id, 'client_secret': client_secret } - response = requests.post(url, data=data) + response = requests.post(token_url, data=data) if debug: print(response.text) return response.json() @@ -102,7 +102,7 @@ hub: c.NextcloudOAuthenticator.username_claim = lambda r: r.get('ocs', {}).get('data', {}).get('id') c.NextcloudOAuthenticator.userdata_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/ocs/v2.php/cloud/user?format=json' c.NextcloudOAuthenticator.authorize_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/authorize' - c.NextcloudOAuthenticator.token_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/api/v1/token' + c.NextcloudOAuthenticator.token_url = token_url c.NextcloudOAuthenticator.oauth_callback_url = 'https://' + os.environ['JUPYTER_HOST'] + '/hub/oauth_callback' c.NextcloudOAuthenticator.allow_all = True c.NextcloudOAuthenticator.refresh_pre_spawn = True