From e15eeccd354336fc5e4742dfece84ada46a9ade5 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 16 Apr 2018 11:40:03 +0200 Subject: [PATCH] match oauth client description and sever token note for spawner api tokens: "Server at /user/:name" --- jupyterhub/user.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jupyterhub/user.py b/jupyterhub/user.py index 5d63a217..9d31db2f 100644 --- a/jupyterhub/user.py +++ b/jupyterhub/user.py @@ -350,9 +350,7 @@ class User: base_url=base_url, ) db.add(orm_server) - note = "server token" - if server_name: - note += " for server %s" % server_name + note = "Server at %s" % base_url api_token = self.new_api_token(note=note) db.commit() @@ -381,7 +379,7 @@ class User: # containers that resume will be updated below client_store.add_client(client_id, api_token, url_path_join(self.url, server_name, 'oauth_callback'), - description="Server at %s" % url_path_join(self.url, server_name), + description="Server at %s" % (url_path_join(self.base_url, server_name) + '/'), ) db.commit()