feat(data-warehouse): add salesforce integration

frontend/src/scenes/data-warehouse/external/forms/SourceForm.tsx

@@ -8,6 +8,8 @@ import { SOURCE_DETAILS, sourceWizardLogic } from '../../new/sourceWizardLogic'
 
 interface SourceFormProps {
     sourceConfig: SourceConfig
+    showPrefix?: boolean
+    showSourceFields?: boolean
 }
 
 const sourceFieldToElement = (field: SourceFieldConfig): JSX.Element => {
@@ -72,15 +74,23 @@ const sourceFieldToElement = (field: SourceFieldConfig): JSX.Element => {
     )
 }
 
-export default function SourceForm({ sourceConfig }: SourceFormProps): JSX.Element {
+export default function SourceForm({
+    sourceConfig,
+    showSourceFields = true,
+    showPrefix = true,
+}: SourceFormProps): JSX.Element {
     return (
         <Form logic={sourceWizardLogic} formKey="sourceConnectionDetails" className="space-y-4" enableFormOnSubmit>
-            <Group name="payload">
-                {SOURCE_DETAILS[sourceConfig.name].fields.map((field) => sourceFieldToElement(field))}
-            </Group>
-            <LemonField name="prefix" label="Table Prefix (optional)">
-                <LemonInput className="ph-ignore-input" data-attr="prefix" placeholder="internal_" />
-            </LemonField>
+            {showSourceFields && (
+                <Group name="payload">
+                    {SOURCE_DETAILS[sourceConfig.name].fields.map((field) => sourceFieldToElement(field))}
+                </Group>
+            )}
+            {showPrefix && (
+                <LemonField name="prefix" label="Table Prefix (optional)">
+                    <LemonInput className="ph-ignore-input" data-attr="prefix" placeholder="internal_" />
+                </LemonField>
+            )}
         </Form>
     )
 }

frontend/src/scenes/data-warehouse/new/NewSourceWizard.tsx

@@ -212,11 +212,31 @@ function FirstStep(): JSX.Element {
 }
 
 function SecondStep(): JSX.Element {
-    const { selectedConnector } = useValues(sourceWizardLogic)
+    const { selectedConnector, source } = useValues(sourceWizardLogic)
+
+    let showPrefix = true
+    let showSourceFields = true
+    if (selectedConnector?.name === 'Salesforce') {
+        if (source.payload.code && source.payload.subdomain) {
+            showPrefix = true
+            showSourceFields = false
+        } else {
+            showPrefix = false
+            showSourceFields = true
+        }
+    }
 
     return (
         <ModalPage page={2}>
-            {selectedConnector ? <SourceForm sourceConfig={selectedConnector} /> : <DatawarehouseTableForm />}
+            {selectedConnector ? (
+                <SourceForm
+                    sourceConfig={selectedConnector}
+                    showPrefix={showPrefix}
+                    showSourceFields={showSourceFields}
+                />
+            ) : (
+                <DatawarehouseTableForm />
+            )}
         </ModalPage>
     )
 }

frontend/src/scenes/data-warehouse/new/sourceWizardLogic.tsx

@@ -24,6 +24,7 @@ import { dataWarehouseTableLogic } from './dataWarehouseTableLogic'
 import type { sourceWizardLogicType } from './sourceWizardLogicType'
 
 export const getHubspotRedirectUri = (): string => `${window.location.origin}/data-warehouse/hubspot/redirect`
+export const getSalesforceRedirectUri = (): string => `${window.location.origin}/data-warehouse/salesforce/redirect`
 
 export const SOURCE_DETAILS: Record<ExternalDataSourceType, SourceConfig> = {
     Stripe: {
@@ -288,6 +289,19 @@ export const SOURCE_DETAILS: Record<ExternalDataSourceType, SourceConfig> = {
             },
         ],
     },
+    Salesforce: {
+        name: 'Salesforce',
+        fields: [
+            {
+                name: 'subdomain',
+                label: 'Salesforce subdomain',
+                type: 'text',
+                required: true,
+                placeholder: '',
+            },
+        ],
+        caption: '',
+    },
 }
 
 export const buildKeaFormDefaultFromSourceDetails = (
@@ -605,6 +619,27 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
                 }
             },
         ],
+        addToSalesforceButtonUrl: [
+            (s) => [s.preflight],
+            (preflight) => {
+                return (subdomain: string) => {
+                    const clientId = preflight?.data_warehouse_integrations?.salesforce.client_id
+
+                    if (!clientId) {
+                        return null
+                    }
+
+                    const params = new URLSearchParams()
+                    params.set('client_id', clientId)
+                    params.set('redirect_uri', `${window.location.origin}/data-warehouse/salesforce/redirect`)
+                    params.set('response_type', 'code')
+                    params.set('scope', 'refresh_token api')
+                    params.set('state', subdomain)
+
+                    return `https://${subdomain}.my.salesforce.com/services/oauth2/authorize?${params.toString()}`
+                }
+            },
+        ],
         modalTitle: [
             (s) => [s.currentStep],
             (currentStep) => {
@@ -737,7 +772,18 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
                             redirect_uri: getHubspotRedirectUri(),
                         },
                     })
-                    return
+                    break
+                }
+                case 'salesforce': {
+                    actions.updateSource({
+                        source_type: 'Salesforce',
+                        payload: {
+                            code: searchParams.code,
+                            subdomain: searchParams.subdomain,
+                            redirect_uri: getSalesforceRedirectUri(),
+                        },
+                    })
+                    break
                 }
                 default:
                     lemonToast.error(`Something went wrong.`)
@@ -775,6 +821,13 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
             if (kind === 'hubspot') {
                 router.actions.push(urls.dataWarehouseTable(), { kind, code: searchParams.code })
             }
+            if (kind === 'salesforce') {
+                router.actions.push(urls.dataWarehouseTable(), {
+                    kind,
+                    code: searchParams.code,
+                    subdomain: searchParams.state,
+                })
+            }
         },
         '/data-warehouse/new': (_, searchParams) => {
             if (searchParams.kind == 'hubspot' && searchParams.code) {
@@ -784,16 +837,39 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
                 })
                 actions.setStep(2)
             }
+            if (searchParams.kind == 'salesforce' && searchParams.code) {
+                actions.selectConnector(SOURCE_DETAILS['Salesforce'])
+                actions.handleRedirect(searchParams.kind, {
+                    code: searchParams.code,
+                    subdomain: searchParams.subdomain,
+                })
+                actions.setStep(2)
+            }
         },
     })),
     forms(({ actions, values }) => ({
         sourceConnectionDetails: {
             defaults: buildKeaFormDefaultFromSourceDetails(SOURCE_DETAILS),
             errors: (sourceValues) => {
+                if (
+                    values.selectedConnector?.name === 'Salesforce' &&
+                    values.source.payload.code &&
+                    values.source.payload.subdomain
+                ) {
+                    return {}
+                }
                 return getErrorsForFields(values.selectedConnector?.fields ?? [], sourceValues as any)
             },
             submit: async (sourceValues) => {
                 if (values.selectedConnector) {
+                    if (
+                        values.selectedConnector.name === 'Salesforce' &&
+                        (!values.source.payload.code || !values.source.payload.subdomain)
+                    ) {
+                        window.open(values.addToSalesforceButtonUrl(sourceValues.payload.subdomain) as string)
+                        return
+                    }
+
                     const payload = {
                         ...sourceValues,
                         source_type: values.selectedConnector.name,
@@ -803,19 +879,28 @@ export const sourceWizardLogic = kea<sourceWizardLogicType>([
                     try {
                         await api.externalDataSources.source_prefix(payload.source_type, sourceValues.prefix)
 
-                        const payloadKeys = (values.selectedConnector?.fields ?? []).map((n) => n.name)
-
-                        // Only store the keys of the source type we're using
-                        actions.updateSource({
-                            ...payload,
-                            payload: {
-                                source_type: values.selectedConnector.name,
-                                ...payloadKeys.reduce((acc, cur) => {
-                                    acc[cur] = payload['payload'][cur]
-                                    return acc
-                                }, {} as Record<string, any>),
-                            },
-                        })
+                        // salesforce doesn't need to store the payload. The relevant fielsd will already be handled from the URL
+                        // only update the prefix
+                        if (values.selectedConnector.name === 'Salesforce') {
+                            actions.updateSource({
+                                ...values.source,
+                                prefix: sourceValues.prefix,
+                            })
+                        } else {
+                            const payloadKeys = (values.selectedConnector?.fields ?? []).map((n) => n.name)
+
+                            // Only store the keys of the source type we're using
+                            actions.updateSource({
+                                ...payload,
+                                payload: {
+                                    source_type: values.selectedConnector.name,
+                                    ...payloadKeys.reduce((acc, cur) => {
+                                        acc[cur] = payload['payload'][cur]
+                                        return acc
+                                    }, {} as Record<string, any>),
+                                },
+                            })
+                        }
 
                         actions.setIsLoading(false)
                     } catch (e: any) {

frontend/src/scenes/data-warehouse/settings/DataWarehouseManagedSourcesTable.tsx

@@ -21,6 +21,7 @@ import googleStorageLogo from 'public/google-cloud-storage-logo.png'
 import hubspotLogo from 'public/hubspot-logo.svg'
 import postgresLogo from 'public/postgres-logo.svg'
 import s3Logo from 'public/s3-logo.png'
+import salesforceLogo from 'public/salesforce-logo.svg'
 import snowflakeLogo from 'public/snowflake-logo.svg'
 import stripeLogo from 'public/stripe-logo.svg'
 import zendeskLogo from 'public/zendesk-logo.svg'
@@ -247,6 +248,7 @@ export function RenderDataWarehouseSourceIcon({
         aws: s3Logo,
         'google-cloud': googleStorageLogo,
         'cloudflare-r2': cloudflareLogo,
+        Salesforce: salesforceLogo,
     }[type]
 
     return (

frontend/src/types.ts

@@ -2941,6 +2941,9 @@ export interface PreflightStatus {
         hubspot: {
             client_id?: string
         }
+        salesforce: {
+            client_id?: string
+        }
     }
     /** Whether PostHog is running in DEBUG mode. */
     is_debug?: boolean
@@ -3810,7 +3813,7 @@ export enum DataWarehouseSettingsTab {
     SelfManaged = 'self_managed',
 }
 
-export const externalDataSources = ['Stripe', 'Hubspot', 'Postgres', 'Zendesk', 'Snowflake'] as const
+export const externalDataSources = ['Stripe', 'Hubspot', 'Postgres', 'Zendesk', 'Snowflake', 'Salesforce'] as const
 
 export type ExternalDataSourceType = (typeof externalDataSources)[number]
 

latest_migrations.manifest

@@ -5,7 +5,7 @@ contenttypes: 0002_remove_content_type_name
 ee: 0016_rolemembership_organization_member
 otp_static: 0002_throttling
 otp_totp: 0002_auto_20190420_0723
-posthog: 0431_externaldataschema_sync_type_payload
+posthog: 0432_alter_externaldatasource_source_type
 sessions: 0001_initial
 social_django: 0010_uid_db_index
 two_factor: 0007_auto_20201201_1019