update DEX_TOKEN to be the pachyderm ID_TOKEN

pachyderm · Jan 16, 2024 · 37e2125 · 37e2125
1 parent e9d2774
commit 37e2125
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/jupyter-extension/jupyterlab_pachyderm/env.py b/jupyter-extension/jupyterlab_pachyderm/env.py
@@ -5,7 +5,7 @@
 PACH_CONFIG = os.environ.get("PACH_CONFIG", Path.home() / ".pachyderm/config.json")
 PFS_MOUNT_DIR = os.environ.get("PFS_MOUNT_DIR", "/pfs")
 PACHD_ADDRESS = os.environ.get("PACHD_ADDRESS", None)
-DEX_TOKEN = os.environ.get("DEX_TOKEN", None)
+DEX_TOKEN = os.environ.get("DEX_TOKEN", None)  # If specified, this is the ID_TOKEN used in auth
 
 PACHYDERM_EXT_DEBUG = strtobool(os.environ.get("PACHYDERM_EXT_DEBUG", "False").lower())
 if PACHYDERM_EXT_DEBUG:

diff --git a/jupyter-extension/jupyterlab_pachyderm/handlers.py b/jupyter-extension/jupyterlab_pachyderm/handlers.py
@@ -460,7 +460,9 @@ def setup_handlers(web_app):
         )
     except FileNotFoundError:
         if PACHD_ADDRESS:
-            client = Client().from_pachd_address(pachd_address=PACHD_ADDRESS, auth_token=DEX_TOKEN)
+            client = Client().from_pachd_address(pachd_address=PACHD_ADDRESS)
+            if DEX_TOKEN:
+                client.auth_token = client.auth.authenticate(id_token=DEX_TOKEN).pach_token
         else:
             client = Client()
             get_logger().debug(