Merge pull request #194 from seamapi/seam-client-fix

matt-the-dev · web-flow · commit 9db60688ee83 · 2023-05-05T08:38:58.000-07:00
fix: don't consider JWT tokens as API Key authentication values
diff --git a/src/seam-connect/client.ts b/src/seam-connect/client.ts
@@ -148,6 +148,11 @@ export class Seam extends Routes {
   }
 }
 
+const isValueUsedForBearerAuthentication = (value: string) =>
+  value.startsWith("seam_at") ||
+  /** Exclude JWT tokens as well */
+  value.startsWith("ey")
+
 const makeRequest = async <T>(
   client: Axios,
   request: AxiosRequestConfig
@@ -201,7 +206,7 @@ const getAuthHeaders = ({
       )
       return { "client-session-token": apiKey }
     }
-    if (!apiKey.startsWith("seam_at") && workspaceId)
+    if (!isValueUsedForBearerAuthentication(apiKey) && workspaceId)
       throw new Error(
         "You can't use API Key Authentication AND specify a workspace. Your API Key only works for the workspace it was created in. To use Session Key Authentication with multi-workspace support, contact Seam support."
       )

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,11 @@ export class Seam extends Routes {`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
	`151`	`+const isValueUsedForBearerAuthentication = (value: string) =>`
	`152`	`+ value.startsWith("seam_at") \|\|`
	`153`	`+ /** Exclude JWT tokens as well */`
	`154`	`+ value.startsWith("ey")`
	`155`	`+`
`151`	`156`	`const makeRequest = async <T>(`
`152`	`157`	`client: Axios,`
`153`	`158`	`request: AxiosRequestConfig`
`@@ -201,7 +206,7 @@ const getAuthHeaders = ({`
`201`	`206`	`)`
`202`	`207`	`return { "client-session-token": apiKey }`
`203`	`208`	`}`
`204`		`- if (!apiKey.startsWith("seam_at") && workspaceId)`
	`209`	`+ if (!isValueUsedForBearerAuthentication(apiKey) && workspaceId)`
`205`	`210`	`throw new Error(`
`206`	`211`	`"You can't use API Key Authentication AND specify a workspace. Your API Key only works for the workspace it was created in. To use Session Key Authentication with multi-workspace support, contact Seam support."`
`207`	`212`	`)`