Handle isSeamHttpOptionsWithClient in createAxiosClient

seamapi · Sep 26, 2023 · 1b3d888 · 1b3d888
1 parent 62939dd
commit 1b3d888
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 40 deletions.
diff --git a/src/lib/seam/connect/axios.ts b/src/lib/seam/connect/axios.ts
@@ -2,13 +2,15 @@ import axios, { type Axios } from 'axios'
 
 import { getAuthHeaders } from './auth.js'
 import {
+  isSeamHttpOptionsWithClient,
   isSeamHttpOptionsWithClientSessionToken,
   type SeamHttpOptions,
 } from './client-options.js'
 
 export const createAxiosClient = (
   options: Required<SeamHttpOptions>,
 ): Axios => {
+  if (isSeamHttpOptionsWithClient(options)) return options.client
   // TODO: axiosRetry? Allow options to configure this if so
   return axios.create({
     baseURL: options.endpoint,

diff --git a/src/lib/seam/connect/client.ts b/src/lib/seam/connect/client.ts
@@ -23,8 +23,7 @@ export class SeamHttp {
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
     this.#legacy = options.enableLegacyMethodBehaivor
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/access-codes-unmanaged.ts b/src/lib/seam/connect/routes/access-codes-unmanaged.ts
@@ -23,8 +23,7 @@ export class SeamHttpAccessCodesUnmanaged {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/access-codes.ts b/src/lib/seam/connect/routes/access-codes.ts
@@ -23,8 +23,7 @@ export class SeamHttpAccessCodes {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/acs-access-groups.ts b/src/lib/seam/connect/routes/acs-access-groups.ts
@@ -23,8 +23,7 @@ export class SeamHttpAcsAccessGroups {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/acs-credentials.ts b/src/lib/seam/connect/routes/acs-credentials.ts
@@ -23,8 +23,7 @@ export class SeamHttpAcsCredentials {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/acs-systems.ts b/src/lib/seam/connect/routes/acs-systems.ts
@@ -23,8 +23,7 @@ export class SeamHttpAcsSystems {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/acs-users.ts b/src/lib/seam/connect/routes/acs-users.ts
@@ -23,8 +23,7 @@ export class SeamHttpAcsUsers {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/action-attempts.ts b/src/lib/seam/connect/routes/action-attempts.ts
@@ -23,8 +23,7 @@ export class SeamHttpActionAttempts {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/client-sessions.ts b/src/lib/seam/connect/routes/client-sessions.ts
@@ -23,8 +23,7 @@ export class SeamHttpClientSessions {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/connect-webviews.ts b/src/lib/seam/connect/routes/connect-webviews.ts
@@ -23,8 +23,7 @@ export class SeamHttpConnectWebviews {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/connected-accounts.ts b/src/lib/seam/connect/routes/connected-accounts.ts
@@ -23,8 +23,7 @@ export class SeamHttpConnectedAccounts {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/devices-unmanaged.ts b/src/lib/seam/connect/routes/devices-unmanaged.ts
@@ -23,8 +23,7 @@ export class SeamHttpDevicesUnmanaged {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/devices.ts b/src/lib/seam/connect/routes/devices.ts
@@ -23,8 +23,7 @@ export class SeamHttpDevices {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/events.ts b/src/lib/seam/connect/routes/events.ts
@@ -23,8 +23,7 @@ export class SeamHttpEvents {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/locks.ts b/src/lib/seam/connect/routes/locks.ts
@@ -23,8 +23,7 @@ export class SeamHttpLocks {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/noise-sensors-noise-thresholds.ts b/src/lib/seam/connect/routes/noise-sensors-noise-thresholds.ts
@@ -23,8 +23,7 @@ export class SeamHttpNoiseSensorsNoiseThresholds {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/thermostats-climate-setting-schedules.ts b/src/lib/seam/connect/routes/thermostats-climate-setting-schedules.ts
@@ -23,8 +23,7 @@ export class SeamHttpThermostatsClimateSettingSchedules {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/thermostats.ts b/src/lib/seam/connect/routes/thermostats.ts
@@ -23,8 +23,7 @@ export class SeamHttpThermostats {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/webhooks.ts b/src/lib/seam/connect/routes/webhooks.ts
@@ -23,8 +23,7 @@ export class SeamHttpWebhooks {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(

diff --git a/src/lib/seam/connect/routes/workspaces.ts b/src/lib/seam/connect/routes/workspaces.ts
@@ -23,8 +23,7 @@ export class SeamHttpWorkspaces {
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions) {
     const options = parseOptions(apiKeyOrOptions)
-    const client = 'client' in options ? options.client : null
-    this.client = client ?? createAxiosClient(options)
+    this.client = createAxiosClient(options)
   }
 
   static fromClient(