feat: Hooking up supaglue proxy link

main/app/api/[...trpc]/route.ts

@@ -14,6 +14,7 @@ const handler = (req: Request) =>
       createContext({
         headers: req.headers,
         nangoSecretKey: env.NANGO_SECRET_KEY,
+        supaglueApiKey: env.SUPAGLUE_API_KEY,
       }),
   })
 

main/env.ts

@@ -4,13 +4,14 @@ import {z} from 'zod'
 export const env = createEnv({
   server: {
     NANGO_SECRET_KEY: z.string(),
+    SUPAGLUE_API_KEY: z.string(),
   },
   client: {
     NEXT_PUBLIC_NANGO_PUBLIC_KEY: z.string(),
   },
   runtimeEnv: {
     NANGO_SECRET_KEY: process.env.NANGO_SECRET_KEY,
+    SUPAGLUE_API_KEY: process.env.SUPAGLUE_API_KEY,
     NEXT_PUBLIC_NANGO_PUBLIC_KEY: process.env.NEXT_PUBLIC_NANGO_PUBLIC_KEY,
   },
-
 })

packages/api/createContext.ts

@@ -14,13 +14,8 @@ const providerByName = {
   salesforce: salesforceProvider,
 }
 
-export function createContext(opts: {
-  headers: Headers
-  nangoSecretKey: string
-}): RouterContext {
-  return {
-    headers: opts.headers,
-    nangoSecretKey: opts.nangoSecretKey,
-    providerByName,
-  }
+export function createContext(
+  opts: Omit<RouterContext, 'providerByName'>,
+): RouterContext {
+  return {...opts, providerByName}
 }

packages/vdk/provider.ts

@@ -38,6 +38,11 @@ export type ProviderFromRouter<TRouter extends AnyRouter, TInstance = {}> = {
  */
 export const PLACEHOLDER_BASE_URL = 'http://placeholder'
 
+export const featureFlags = {
+  // Switch this over after credentials migration
+  mode: 'supaglue' as 'supaglue' | 'nango',
+}
+
 export async function proxyCallProvider({
   input,
   ctx,
@@ -46,19 +51,22 @@ export async function proxyCallProvider({
   ctx: RemoteProcedureContext
 }) {
   const instance = ctx.provider.__init__({
-    proxyLinks: [
-      (req, next) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-        const baseUrl = (instance as any)?.clientOptions?.baseUrl as
-          | string
-          | undefined
-        if (baseUrl && baseUrl !== PLACEHOLDER_BASE_URL) {
-          req.headers.set(nangoProxyLink.kBaseUrlOverride, baseUrl)
-        }
-        return next(req)
-      },
-      ctx.nangoLink,
-    ],
+    proxyLinks:
+      featureFlags.mode === 'nango'
+        ? [
+            (req, next) => {
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+              const baseUrl = (instance as any)?.clientOptions?.baseUrl as
+                | string
+                | undefined
+              if (baseUrl && baseUrl !== PLACEHOLDER_BASE_URL) {
+                req.headers.set(nangoProxyLink.kBaseUrlOverride, baseUrl)
+              }
+              return next(req)
+            },
+            ctx.nangoLink,
+          ]
+        : [ctx.supaglueLink],
   })
 
   // verticals.salesEngagement.listContacts -> listContacts

packages/vdk/trpc.ts

@@ -2,9 +2,11 @@ import type {OpenApiMeta} from '@lilyrose2798/trpc-openapi'
 import {initTRPC, TRPCError} from '@trpc/server'
 import {nangoProxyLink} from './nangoProxyLink'
 import type {Provider} from './provider'
+import {supaglueProxyLink} from './supaglueProxyLink'
 
 export type RouterContext = {
   nangoSecretKey: string
+  supaglueApiKey: string
   headers: Headers
   providerByName: Record<string, Provider>
 }
@@ -52,14 +54,21 @@ export const remoteProcedure = publicProcedure.use(
         ctx.headers.get('x-provider-config-key') ?? providerName,
     })
 
+    const supaglueLink = supaglueProxyLink({
+      apiKey: ctx.headers.get('x-api-key') ?? ctx.supaglueApiKey,
+      customerId,
+      providerName,
+    })
+
     return next({
       ctx: {
         ...ctx,
         path,
-        connectionId: customerId,
+        customerId,
         providerName,
         provider,
         nangoLink,
+        supaglueLink,
       },
     })
   },

packages/worker/env.ts

@@ -4,7 +4,11 @@ import {initNangoSDK} from '@opensdks/sdk-nango'
 
 // Dedupe this with main/env.ts
 export const env = createEnv({
-  server: {NANGO_SECRET_KEY: z.string(), POSTGRES_URL: z.string()},
+  server: {
+    NANGO_SECRET_KEY: z.string(),
+    SUPAGLUE_API_KEY: z.string(),
+    POSTGRES_URL: z.string(),
+  },
   runtimeEnv: process.env,
 })
 

packages/worker/routines.ts

@@ -88,8 +88,8 @@ export async function syncConnection({
 
   const supaglue = initBYOSupaglueSDK({
     headers: {
-      'x-customer-id': connection_id,
-      'x-provider-name': provider_config_key,
+      'x-customer-id': connection_id, // This relies on customer-id mapping 1:1 to connection_id
+      'x-provider-name': provider_config_key, // This relies on provider_config_key mapping 1:1 to provider-name
     },
   })
 

verticals/vertical-sales-engagement/providers/apollo-provider.ts

@@ -23,7 +23,11 @@ export const apolloProvider = {
   __init__: ({proxyLinks}) =>
     initApolloSDK({
       api_key: '', // This will be populated by Nango, or you can populate your own
-      links: (defaultLinks) => [...proxyLinks, ...defaultLinks],
+      links: (defaultLinks) => [
+        ...defaultLinks.slice(0, -1),
+        ...proxyLinks, // proxy links shoudl be in the middle... 
+        ...defaultLinks.slice(-1),
+      ],
     }),
   listContacts: async ({instance}) => {
     const res = await instance.POST('/v1/contacts/search', {})