fix: SeamHttpMultiWorkspace with SEAM_PERSONAL_ACCESS_TOKEN

Author: razor-x

ava.config.js

@@ -4,6 +4,8 @@ export default () => {
   delete env.SEAM_API_KEY
   delete env.SEAM_ENDPOINT
   delete env.SEAM_API_URL
+  delete env.SEAM_PERSONAL_ACCESS_TOKEN
+  delete env.SEAM_WORKSPACE_ID
 
   return {
     ignoredByWatcher: ['tmp/**/*'],

src/lib/seam/connect/env.d.ts

@@ -4,6 +4,8 @@ declare global {
       SEAM_API_KEY?: string
       SEAM_API_URL?: string
       SEAM_ENDPOINT?: string
+      SEAM_PERSONAL_ACCESS_TOKEN?: string
+      SEAM_WORKSPACE_ID?: string
     }
   }
 }

src/lib/seam/connect/parse-options.ts

@@ -99,9 +99,8 @@ const getNormalizedOptions = (
   return {
     ...options,
     ...(apiKey != null ? { apiKey } : {}),
-    ...(personalAccessToken != null && workspaceId != null
-      ? { personalAccessToken, workspaceId }
-      : {}),
+    ...(workspaceId != null ? { workspaceId } : {}),
+    ...(personalAccessToken != null ? { personalAccessToken } : {}),
     ...requestOptions,
   }
 }
@@ -133,11 +132,11 @@ const getPersonalAccessTokenFromEnv = (
   if ('consoleSessionToken' in options && options.consoleSessionToken != null) {
     return null
   }
-  return globalThis.process?.env?.['SEAM_PERSONAL_ACCESS_TOKEN']
+  return globalThis.process?.env?.SEAM_PERSONAL_ACCESS_TOKEN
 }
 
 const getWorkspaceIdFromEnv = (): string | null | undefined => {
-  return globalThis.process?.env?.['SEAM_WORKSPACE_ID']
+  return globalThis.process?.env?.SEAM_WORKSPACE_ID
 }
 
 const getEndpointFromEnv = (): string | null | undefined => {

test/seam/connect/env.test.ts

@@ -17,6 +17,8 @@ const cleanupEnv = (): void => {
   delete env.SEAM_API_KEY
   delete env.SEAM_ENDPOINT
   delete env.SEAM_API_URL
+  delete env.SEAM_PERSONAL_ACCESS_TOKEN
+  delete env.SEAM_WORKSPACE_ID
 }
 test.afterEach(cleanupEnv)
 test.beforeEach(cleanupEnv)
@@ -282,8 +284,8 @@ test.serial(
   'SeamHttp: constructor uses SEAM_PERSONAL_ACCESS_TOKEN and SEAM_WORKSPACE_ID environment variables',
   async (t) => {
     const { seed, endpoint } = await getTestServer(t)
-    env['SEAM_PERSONAL_ACCESS_TOKEN'] = seed.seam_at1_token
-    env['SEAM_WORKSPACE_ID'] = seed.seed_workspace_1
+    env.SEAM_PERSONAL_ACCESS_TOKEN = seed.seam_at1_token
+    env.SEAM_WORKSPACE_ID = seed.seed_workspace_1
     const seam = new SeamHttp({ endpoint })
     const device = await seam.devices.get({
       device_id: seed.august_device_1,
@@ -297,8 +299,8 @@ test.serial(
   'SeamHttp: throws error when both SEAM_API_KEY and SEAM_PERSONAL_ACCESS_TOKEN are defined',
   (t) => {
     env.SEAM_API_KEY = 'some-api-key'
-    env['SEAM_PERSONAL_ACCESS_TOKEN'] = 'some-access-token'
-    env['SEAM_WORKSPACE_ID'] = 'some-workspace-id'
+    env.SEAM_PERSONAL_ACCESS_TOKEN = 'some-access-token'
+    env.SEAM_WORKSPACE_ID = 'some-workspace-id'
     t.throws(() => new SeamHttp(), {
       instanceOf: SeamHttpInvalidOptionsError,
       message:
@@ -311,8 +313,8 @@ test.serial(
   'SeamHttp: personalAccessToken option overrides environment variables',
   async (t) => {
     const { seed, endpoint } = await getTestServer(t)
-    env['SEAM_PERSONAL_ACCESS_TOKEN'] = 'some-invalid-token'
-    env['SEAM_WORKSPACE_ID'] = seed.seed_workspace_1
+    env.SEAM_PERSONAL_ACCESS_TOKEN = 'some-invalid-token'
+    env.SEAM_WORKSPACE_ID = seed.seed_workspace_1
     const seam = new SeamHttp({
       personalAccessToken: seed.seam_at1_token,
       endpoint,
@@ -329,8 +331,8 @@ test.serial(
   'SeamHttp: workspaceId option overrides environment variables',
   async (t) => {
     const { seed, endpoint } = await getTestServer(t)
-    env['SEAM_PERSONAL_ACCESS_TOKEN'] = seed.seam_at1_token
-    env['SEAM_WORKSPACE_ID'] = 'some-invalid-workspace'
+    env.SEAM_PERSONAL_ACCESS_TOKEN = seed.seam_at1_token
+    env.SEAM_WORKSPACE_ID = 'some-invalid-workspace'
     const seam = new SeamHttp({
       workspaceId: seed.seed_workspace_1,
       endpoint,
@@ -347,7 +349,7 @@ test.serial(
   'SeamHttpMultiWorkspace: constructor uses SEAM_PERSONAL_ACCESS_TOKEN environment variable',
   async (t) => {
     const { seed, endpoint } = await getTestServer(t)
-    env['SEAM_PERSONAL_ACCESS_TOKEN'] = seed.seam_at1_token
+    env.SEAM_PERSONAL_ACCESS_TOKEN = seed.seam_at1_token
     const multiWorkspace = new SeamHttpMultiWorkspace({ endpoint })
     const workspaces = await multiWorkspace.workspaces.list()
     t.true(workspaces.length > 0)
@@ -358,7 +360,7 @@ test.serial(
   'SeamHttpMultiWorkspace: personalAccessToken option overrides environment variables',
   async (t) => {
     const { seed, endpoint } = await getTestServer(t)
-    env['SEAM_PERSONAL_ACCESS_TOKEN'] = 'some-invalid-token'
+    env.SEAM_PERSONAL_ACCESS_TOKEN = 'some-invalid-token'
     const multiWorkspace = new SeamHttpMultiWorkspace({
       personalAccessToken: seed.seam_at1_token,
       endpoint,