Revert "feat(redirectUri): Custom redirect URIs (#408)"

Due to build failures on main

This reverts commit 7190340.

Author: openint-bot

apps/web/app/console/(authenticated)/settings/client.tsx

@@ -2,81 +2,54 @@
 
 import {toast} from '@openint/ui-v1'
 import SecureInput from '@openint/ui-v1/components/SecureInput'
-import UrlInputForm from '@openint/ui-v1/components/UrlInputForm'
+import WebhookInput from '@openint/ui-v1/components/WebhookInput'
 import {useMutation} from '@openint/ui-v1/trpc'
 import {useTRPC} from '../client'
 
 interface SettingsContentProps {
   orgId: string
   apiKey: string
   webhookUrl: string
-  oauthRedirectUrl: string
 }
 
 export function SettingsContent({
   orgId,
   apiKey,
   webhookUrl,
-  oauthRedirectUrl,
 }: SettingsContentProps) {
   const trpc = useTRPC()
-  const setMetadataUrl = useMutation(
-    trpc.setMetadataUrl.mutationOptions({
+  const setWebhook = useMutation(
+    trpc.setWebhookUrl.mutationOptions({
       onSuccess: () => {
-        toast.success('URL saved successfully')
+        toast.success('Webhook URL saved')
       },
       onError: (error) => {
         toast.error(`Error: ${error.message}`)
       },
     }),
   )
 
-  const handleWebhookSave = (value: string) => {
-    setMetadataUrl.mutate({
-      urlType: 'webhook_url',
-      url: value,
-    })
-  }
-
-  const handleOauthRedirectSave = (value: string) => {
-    setMetadataUrl.mutate({
-      urlType: 'oauth_redirect_url',
-      url: value,
-    })
+  const handleSave = (value: string) => {
+    setWebhook.mutate({webhookUrl: value})
   }
 
   return (
     <div className="p-6">
       <h2 className="mb-4 text-2xl font-bold tracking-tight">Settings</h2>
-      <SecureInput
-        label="Organization Id"
-        value={orgId}
-        showValue={true}
-        className="mt-4 flex items-center"
-      />
+      <p className="mb-4 font-bold">
+        <SecureInput label="Organization Id" value={orgId} showValue={true} />
+      </p>
 
-      <SecureInput
-        label="API Key"
-        readOnly
-        value={apiKey}
-        className="mt-4 flex items-center"
-      />
-      <UrlInputForm
-        inputName="Webhook URL"
-        defaultValue={webhookUrl}
-        placeholder="https://webhook.site/webhook-url"
-        onSave={handleWebhookSave}
-        isSaving={setMetadataUrl.isPending}
-        className="mt-4 flex items-center"
-      />
-      <UrlInputForm
-        inputName="OAuth Redirect URL"
-        defaultValue={oauthRedirectUrl}
-        placeholder="https://app.example.com/oauth/callback"
-        onSave={handleOauthRedirectSave}
-        isSaving={setMetadataUrl.isPending}
-        className="mt-4 flex items-center"
-      />
+      <div className="mt-4 flex items-center">
+        <SecureInput label="API Key" readOnly value={apiKey} />
+      </div>
+      <div className="mt-4 flex items-center">
+        <WebhookInput
+          defaultValue={webhookUrl}
+          onSave={handleSave}
+          isSaving={setWebhook.isPending}
+        />
+      </div>
     </div>
   )
 }

apps/web/app/console/(authenticated)/settings/page.tsx

@@ -15,7 +15,6 @@ export default async function SettingsPage(props: PageProps) {
         orgId={viewer.orgId ?? ''}
         apiKey={org.api_key ?? ''}
         webhookUrl={org.metadata?.webhook_url ?? ''}
-        oauthRedirectUrl={org.metadata?.oauth_redirect_url ?? ''}
       />
     </ClientApp>
   )

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

@@ -115,7 +115,6 @@ 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'},
     )
@@ -167,7 +166,6 @@ 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'},
       ),
@@ -188,7 +186,6 @@ 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'},
       ),

connectors/cnext/_defaults/oauth2/server.ts

@@ -1,7 +1,7 @@
 import {z} from 'zod'
 import type {ConnectorDef, ConnectorServer} from '@openint/cdk'
 import {extractId, makeId} from '@openint/cdk'
-import {getConnectorDefaultCredentials} from '@openint/env'
+import {getConnectorDefaultCredentials, getServerUrl} from '@openint/env'
 import {makeUlid} from '@openint/util'
 import {oauth2Schemas, zOAuthConfig} from './def'
 import {
@@ -10,10 +10,7 @@ import {
   tokenRefreshHandler,
   validateOAuthCredentials,
 } from './handlers'
-import {
-  fillOutStringTemplateVariablesInObjectKeys,
-  getOauthRedirectUri,
-} from './utils'
+import {fillOutStringTemplateVariablesInObjectKeys} from './utils'
 
 function injectCcfgDefaultCredentials(
   connectorConfig: z.infer<typeof oauth2Schemas.connectorConfig>,
@@ -124,7 +121,7 @@ export function generateOAuth2Server<
           ),
           connector_config: ccfg,
         },
-        redirectUri: await getOauthRedirectUri(connectionSettings.orgId),
+        redirectUri: getServerUrl(null) + '/connect/callback',
         connectionId: connectionId,
         //  QQ: fix issue with Type '{ authorization_url: string; }' is not assignable to type 'T["_types"]["connectInput"]
       }) as any
@@ -151,7 +148,7 @@ export function generateOAuth2Server<
         } satisfies z.infer<typeof zOAuthConfig>,
         code: connectOutput.code,
         state: connectOutput.state,
-        redirectUri: await getOauthRedirectUri(connectionSettings.orgId),
+        redirectUri: getServerUrl(null) + '/connect/callback',
       })
 
       return {

connectors/cnext/_defaults/oauth2/utils.ts

@@ -1,7 +1,4 @@
 import {z} from 'zod'
-import {eq, schema} from '@openint/db'
-import {initDbNeon} from '@openint/db/db.neon'
-import {envRequired, getServerUrl} from '@openint/env'
 import {zOAuthConfig} from './def'
 
 export function prepareScopes(
@@ -145,25 +142,3 @@ export function mapOauthParams(
 
   return result
 }
-
-export async function getOauthRedirectUri(
-  orgId: string,
-  organization?: {metadata: {oauth_redirect_url?: string}},
-): Promise<string> {
-  // if organization is provided, use the oauth_redirect_url from the organization
-  if (organization) {
-    return (
-      organization.metadata?.oauth_redirect_url ??
-      getServerUrl(null) + '/connect/callback'
-    )
-  }
-  // if no organization is provided, get the organization from the database
-  const db = initDbNeon(envRequired.DATABASE_URL)
-  const org = await db.query.organization.findFirst({
-    where: eq(schema.organization.id, orgId),
-  })
-  if (!org) {
-    throw new Error(`Organization not found: ${orgId}`)
-  }
-  return org.metadata?.oauth_redirect_url ?? getServerUrl(null) + '/connect/callback'
-}

kits/cdk/connector-meta.types.ts

@@ -113,7 +113,6 @@ 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

@@ -103,7 +103,6 @@ export const connectRouter = router({
           extCustomerId: (ctx.viewer.role === 'customer'
             ? ctx.viewer.customerId
             : ctx.viewer.userId) as ExtCustomerId,
-          orgId: ctx.viewer.orgId,
         },
         input.data.input,
       )
@@ -171,12 +170,6 @@ 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,
@@ -187,7 +180,6 @@ 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/api-v1/routers/index.ts

@@ -7,7 +7,7 @@ import {connectorConfigRouter} from './connectorConfig'
 import {customerRouter} from './customer'
 import {eventRouter} from './event'
 import {generalRouter} from './general'
-import {organizationRouter} from './organization'
+import {onboardingRouter} from './onboarding'
 
 export const appRouter = trpc.mergeRouters(
   connectorRouter,
@@ -17,7 +17,7 @@ export const appRouter = trpc.mergeRouters(
   eventRouter,
   customerRouter,
   generalRouter,
-  organizationRouter,
+  onboardingRouter,
 )
 
 export type AppRouter = typeof appRouter

packages/api-v1/routers/organization.spec.ts renamed to packages/api-v1/routers/onboarding.spec.ts

@@ -1,16 +1,14 @@
 import type {Viewer} from '@openint/cdk'
-import {eq, schema} from '@openint/db'
+import {schema} from '@openint/db'
 import {describeEachDatabase} from '@openint/db/__tests__/test-utils'
 import {routerContextFromViewer} from '../trpc/context'
-import {organizationRouter} from './organization'
+import {onboardingRouter} from './onboarding'
 
 const logger = false
 
 describeEachDatabase({drivers: ['pglite'], migrate: true, logger}, (db) => {
   function getCaller(viewer: Viewer) {
-    return organizationRouter.createCaller(
-      routerContextFromViewer({db, viewer}),
-    )
+    return onboardingRouter.createCaller(routerContextFromViewer({db, viewer}))
   }
 
   const orgId = 'org_222'
@@ -103,69 +101,14 @@ describeEachDatabase({drivers: ['pglite'], migrate: true, logger}, (db) => {
     })
   })
 
-  describe('setMetadataUrl', () => {
+  describe('setWebhookUrl', () => {
     test('updates webhook URL', async () => {
-      await asOrg.setMetadataUrl({
-        urlType: 'webhook_url',
-        url: 'https://webhook.site/webhook-url',
+      await asOrg.setWebhookUrl({
+        webhookUrl: 'https://webhook.site/xxx',
       })
 
       const org = await asOrg.getOrganization()
-      expect(org.metadata.webhook_url).toBe('https://webhook.site/webhook-url')
-    })
-
-    test('updates OAuth redirect URL', async () => {
-      await asOrg.setMetadataUrl({
-        urlType: 'oauth_redirect_url',
-        url: 'https://app.example.com/oauth/callback',
-      })
-
-      const org = await db.query.organization.findFirst({
-        where: eq(schema.organization.id, orgId),
-      })
-      expect(org?.metadata?.oauth_redirect_url).toBe(
-        'https://app.example.com/oauth/callback',
-      )
-    })
-
-    test('rejects invalid webhook URL', async () => {
-      await expect(
-        asOrg.setMetadataUrl({
-          urlType: 'webhook_url',
-          url: 'http://insecure-webhook.com',
-        }),
-      ).rejects.toThrow('Invalid webhook URL. It must start with "https://".')
-    })
-
-    test('rejects invalid OAuth redirect URL', async () => {
-      await expect(
-        asOrg.setMetadataUrl({
-          urlType: 'oauth_redirect_url',
-          url: 'not-a-valid-url',
-        }),
-      ).rejects.toThrow(
-        'Invalid OAuth redirect URL. Please provide a valid URL.',
-      )
-    })
-
-    test('does not update if URL is unchanged', async () => {
-      const initialOrg = await db.query.organization.findFirst({
-        where: eq(schema.organization.id, orgId),
-      })
-
-      // Wait a bit to ensure timestamp would be different if updated
-      await new Promise((resolve) => setTimeout(resolve, 5))
-
-      await asOrg.setMetadataUrl({
-        urlType: 'webhook_url',
-        url: 'https://webhook.site/webhook-url',
-      })
-
-      const updatedOrg = await db.query.organization.findFirst({
-        where: eq(schema.organization.id, orgId),
-      })
-
-      expect(updatedOrg?.metadata).toEqual(initialOrg?.metadata)
+      expect(org.metadata.webhook_url).toBe('https://webhook.site/xxx')
     })
   })
 })