fix: support fallback to env variable for JH token

modelon-community · Jun 27, 2023 · 73833b2 · 73833b2
1 parent ab8da03
commit 73833b2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/api.ts b/src/api.ts
@@ -91,20 +91,28 @@ class Api {
     }: {
         impactApiKey?: string
         impactToken?: string
-        jupyterHubToken: string
+        jupyterHubToken?: string
         serverAddress: string
         jupyterHubUserPath?: string
     }) {
         this.baseUrl = serverAddress
         this.impactApiKey = impactApiKey
         this.impactToken = impactToken
 
-        if (!jupyterHubToken) {
-            throw new ApiError({
-                errorCode: MissingJupyterHubToken,
-                message:
-                    'Impact client instantiation failed: The jupyterHubToken parameter is mandatory',
-            })
+        if (jupyterHubToken) {
+            this.jhToken = jupyterHubToken
+        } else {
+            // No provided JupyterHub token, to mimick impact-python-client we try to
+            // fallback on the environment variable available inside JupyterHub.
+            if (process.env.JUPYTERHUB_API_TOKEN) {
+                this.jhToken = process.env.JUPYTERHUB_API_TOKEN
+            } else {
+                throw new ApiError({
+                    errorCode: MissingJupyterHubToken,
+                    message:
+                        'Impact client instantiation failed: Missing JupyterHub token.',
+                })
+            }
         }
 
         if (jupyterHubUserPath) {
@@ -113,7 +121,6 @@ class Api {
                 (jupyterHubUserPath.endsWith('/') ? '' : '/')
         }
 
-        this.jhToken = jupyterHubToken
         this.configureAxios()
     }
 
@@ -124,7 +131,7 @@ class Api {
         serverAddress,
     }: {
         impactApiKey: string
-        jupyterHubToken: string
+        jupyterHubToken?: string
         jupyterHubUserPath?: string
         serverAddress: string
     }) {
@@ -143,7 +150,7 @@ class Api {
         serverAddress,
     }: {
         impactToken: string
-        jupyterHubToken: string
+        jupyterHubToken?: string
         jupyterHubUserPath?: string
         serverAddress: string
     }) {

diff --git a/src/client.ts b/src/client.ts
@@ -16,7 +16,7 @@ class Client {
         serverAddress,
     }: {
         impactApiKey: string
-        jupyterHubToken: string
+        jupyterHubToken?: string
         jupyterHubUserPath?: string
         serverAddress: string
     }) {
@@ -36,7 +36,7 @@ class Client {
         serverAddress,
     }: {
         impactToken: string
-        jupyterHubToken: string
+        jupyterHubToken?: string
         jupyterHubUserPath?: string
         serverAddress: string
     }) {