adding org id to connect context

Author: pellicceama

connectors/cnext/_defaults/oauth2/server.spec.ts

@@ -115,6 +115,7 @@ describeEachDatabase({drivers: ['pglite'], migrate: true, logger}, () => {
       {
         extCustomerId: `cust_123` as any,
         webhookBaseUrl: 'https://example.com/webhook',
+        orgId: `org_123` as any,
       },
       {connectionId: 'test_connection_id'},
     )
@@ -166,6 +167,7 @@ describeEachDatabase({drivers: ['pglite'], migrate: true, logger}, () => {
         {
           extCustomerId: `cust_123` as any,
           webhookBaseUrl: 'https://example.com/webhook',
+          orgId: `org_123` as any,
         },
         {connectionId: 'test_connection_id'},
       ),
@@ -186,6 +188,7 @@ describeEachDatabase({drivers: ['pglite'], migrate: true, logger}, () => {
         {
           extCustomerId: `cust_123` as any,
           webhookBaseUrl: 'https://example.com/webhook',
+          orgId: `org_123` as any,
         },
         {connectionId: 'test_connection_id'},
       ),

kits/cdk/connector-meta.types.ts

@@ -113,6 +113,7 @@ export interface ConnectContext<TSettings>
     externalId: ExternalId
     settings: TSettings
   } | null
+  orgId: `org_${string}`
 }
 
 // TODO: We should rename `provider` to `integration` given that they are both

packages/api-v1/routers/connect.ts

@@ -87,6 +87,13 @@ export const connectRouter = router({
         })
       }
 
+      if (!ctx.viewer.orgId) {
+        throw new TRPCError({
+          code: 'BAD_REQUEST',
+          message: 'OrgId is required',
+        })
+      }
+
       console.log('preConnect', input, ctx, ccfg)
       const res = await connector.preConnect?.(
         ccfg.config,
@@ -96,6 +103,7 @@ export const connectRouter = router({
           extCustomerId: (ctx.viewer.role === 'customer'
             ? ctx.viewer.customerId
             : ctx.viewer.userId) as ExtCustomerId,
+          orgId: ctx.viewer.orgId,
         },
         input.data.input,
       )
@@ -162,6 +170,12 @@ export const connectRouter = router({
         })
       }
 
+      if (!ctx.viewer.orgId) {
+        throw new TRPCError({
+          code: 'BAD_REQUEST',
+          message: 'OrgId is required',
+        })
+      }
       console.log('preConnect', input, ctx, ccfg)
       const connUpdate = await connector.postConnect?.(
         input.data.input,
@@ -172,6 +186,7 @@ export const connectRouter = router({
           extCustomerId: (ctx.viewer.role === 'customer'
             ? ctx.viewer.customerId
             : ctx.viewer.userId) as ExtCustomerId,
+          orgId: ctx.viewer.orgId,
         },
       )
       const id = makeId('conn', input.data.connector_name, makeUlid())

packages/engine-backend/router/customerRouter.ts

@@ -306,6 +306,12 @@ export const customerRouter = trpc.router({
               makeId('conn', int.connector.name, connectionExternalId),
             )
           : undefined
+        if (!ctx.viewer.orgId) {
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: 'OrgId is required',
+          })
+        }
         return int.connector.preConnect?.(
           int.config,
           {
@@ -323,6 +329,7 @@ export const customerRouter = trpc.router({
               customerId:
                 ctx.viewer.role === 'customer' ? ctx.viewer.customerId : null,
             }),
+            orgId: ctx.viewer.orgId,
           },
           preConnInput,
         )
@@ -393,6 +400,12 @@ export const customerRouter = trpc.router({
             console.warn('postConnect input c', parsedInput.error)
           }
 
+          if (!ctx.viewer.orgId) {
+            throw new TRPCError({
+              code: 'BAD_REQUEST',
+              message: 'OrgId is required',
+            })
+          }
           return await int.connector.postConnect(
             int.connector.schemas.connectOutput.parse(input),
             {
@@ -414,6 +427,7 @@ export const customerRouter = trpc.router({
                 customerId:
                   ctx.viewer.role === 'customer' ? ctx.viewer.customerId : null,
               }),
+              orgId: ctx.viewer.orgId,
             },
           )
         })()