chore: Using serverUrl from openapi rather than hard-coding in client

supaglue-labs · Nov 20, 2023 · ede7916 · ede7916
1 parent f9cbcc9
commit ede7916
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/packages/core/remotes/impl/apollo/apollo.client.ts b/packages/core/remotes/impl/apollo/apollo.client.ts
@@ -1,6 +1,7 @@
 import { createOpenapiClient } from '../../utils/createOpenapiClient';
 
 import type { paths } from './apollo.openapi.gen';
+import oas from './apollo.openapi.json';
 
 interface ApolloCredentials {
   apiKey: string;
@@ -9,7 +10,7 @@ interface ApolloCredentials {
 export type ApolloClient = ReturnType<typeof createApolloClient>;
 export function createApolloClient(creds: ApolloCredentials) {
   return createOpenapiClient<paths>({
-    baseUrl: 'https://app.apollo.io/api',
+    baseUrl: oas.servers[0].url,
     preRequest(input, init) {
       if (input && init?.method?.toLowerCase() === 'get') {
         const url = new URL(input);

diff --git a/packages/core/remotes/impl/outreach/outreach.client.ts b/packages/core/remotes/impl/outreach/outreach.client.ts
@@ -3,6 +3,7 @@ import type { OAuthClientOptions } from '../../utils/createOpenapiClient';
 import { createOpenapiOauthClient, HTTPError } from '../../utils/createOpenapiClient';
 
 import type { paths } from './outreach.openapi.gen';
+import oas from './outreach.openapi.json';
 
 interface OutreachCredentials {
   accessToken: string;
@@ -19,7 +20,7 @@ export function createOutreachClient({
 }: { credentials: OutreachCredentials } & Pick<OAuthClientOptions, 'onTokenRefreshed'>) {
   // Maybe worth modifying the outreach openapi spec with refresh token tools
   return createOpenapiOauthClient<paths>({
-    baseUrl: 'https://api.outreach.io/api/v2',
+    baseUrl: oas.servers[0].url,
     ...options,
     tokens: creds,
     refreshTokens: async (client) => {

diff --git a/packages/core/remotes/impl/salesloft/salesloft.client.ts b/packages/core/remotes/impl/salesloft/salesloft.client.ts
@@ -3,6 +3,7 @@ import type { OAuthClientOptions } from '../../utils/createOpenapiClient';
 import { createOpenapiOauthClient } from '../../utils/createOpenapiClient';
 
 import type { paths } from './salesloft.openapi.gen';
+import oas from './salesloft.openapi.json';
 
 interface SalesloftCredentials {
   accessToken: string;
@@ -18,7 +19,7 @@ export function createSalesloftClient({
   ...options
 }: { credentials: SalesloftCredentials } & Pick<OAuthClientOptions, 'onTokenRefreshed'>) {
   return createOpenapiOauthClient<paths>({
-    baseUrl: ' https://api.salesloft.com',
+    baseUrl: oas.servers[0].url,
     ...options,
     tokens: creds,
     refreshTokens: async (client) =>

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": ".",
-    "moduleResolution": "node16"
+    "moduleResolution": "node16",
+    "resolveJsonModule": true
   },
   "include": ["./**/*.ts"]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,7 +4,8 @@
     "outDir": "dist",
     "moduleResolution": "node",
     "target": "esnext",
-    "lib": ["es6"]
+    "lib": ["es6"],
+    "resolveJsonModule": true
   },
   "exclude": ["node_modules", "dist"]
 }