From c6540ea556d17c6232f4be9fef4aa761de9b1ab6 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Thu, 18 Jan 2024 11:28:56 +0100
Subject: [PATCH] Try api request

---
 jupyter/base/values/values.yaml | 60 ++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/jupyter/base/values/values.yaml b/jupyter/base/values/values.yaml
index 96fb512..aab0294 100644
--- a/jupyter/base/values/values.yaml
+++ b/jupyter/base/values/values.yaml
@@ -167,23 +167,73 @@ hub:
         """
         import json
         import os
-        from urllib.parse import urlparse
+        import requests
+        import socket
+        from jupyterhub.services.auth import HubAuthenticated
+        from jupyterhub.utils import url_path_join
         from tornado.httpserver import HTTPServer
         from tornado.ioloop import IOLoop
-        from tornado.web import Application, RequestHandler, authenticated
-        from jupyterhub.services.auth import HubAuthenticated
+        from tornado.web import Application, HTTPError, RequestHandler, authenticated
+        from urllib.parse import urlparse
         def my_debug(s):
           with open("/proc/1/fd/1", "a") as stdout:
             print(s, file=stdout)
 
 
         class RefreshHandler(HubAuthenticated, RequestHandler):
+            def api_request(self, method, url, **kwargs):
+                my_debug(f'{self.hub_auth}')
+                url = url_path_join(self.hub_auth.api_url, url)
+                allow_404 = kwargs.pop('allow_404', False)
+                headers = kwargs.setdefault('headers', {})
+                headers.setdefault('Authorization', f'token {self.hub_auth.api_token}')
+                try:
+                    r = requests.request(method, url, **kwargs)
+                except requests.ConnectionError as e:
+                    my_debug(f'Error connecting to {url}: {e}')
+                    msg = f'Failed to connect to Hub API at {url}.'
+                    msg += f'  Is the Hub accessible at this URL (from host: {socket.gethostname()})?'
+
+                    if '127.0.0.1' in url:
+                        msg += '  Make sure to set c.JupyterHub.hub_ip to an IP accessible to' + \
+                               ' single-user servers if the servers are not on the same host as the Hub.'
+                    raise HTTPError(500, msg)
+
+                data = None
+                if r.status_code == 404 and allow_404:
+                    pass
+                elif r.status_code == 403:
+                    my_debug(
+                        f'I don't have permission to check authorization with JupyterHub, my auth token may have expired: [{r.status_code}] {r.reason}')
+                    my_debug(r.text)
+                    raise HTTPError(
+                        500,
+                        'Permission failure checking authorization, I may need a new token'
+                    )
+                elif r.status_code >= 500:
+                    my_debug(f'Upstream failure verifying auth token: [{r.status_code}] {r.reason}')
+                    my_debug(r.text)
+                    raise HTTPError(
+                        502, 'Failed to check authorization (upstream problem)')
+                elif r.status_code >= 400:
+                    my_debug(f'Failed to check authorization: [{r.status_code}] {r.reason}')
+                    my_debug(r.text)
+                    raise HTTPError(500, 'Failed to check authorization')
+                else:
+                    data = r.json()
+                return data
+
             @authenticated
             def get(self):
                 user_model = self.get_current_user()
-                my_debug(f"DEBUG: In refresh get {user_model}")
+                # Fetch current auth state
+                user_data = self.api_request('GET', url_path_join('users', user_model['name']))
+                auth_state = user_data['auth_state']
+                my_debug(f"DEBUG: {auth_state}")
+
+
                 self.set_header('content-type', 'application/json')
-                self.write(json.dumps(user_model, indent=1, sort_keys=True))
+                self.write(json.dumps(auth_state, indent=1, sort_keys=True))
 
         class PingHandler(RequestHandler):