diff --git a/packages/backend/src/apps/pipedrive/actions/create-activity/index.ts b/packages/backend/src/apps/pipedrive/actions/create-activity/index.ts index fecebbe4..8dbef113 100644 --- a/packages/backend/src/apps/pipedrive/actions/create-activity/index.ts +++ b/packages/backend/src/apps/pipedrive/actions/create-activity/index.ts @@ -197,7 +197,7 @@ export default defineAction({ const { data: { data }, - } = await $.http.post(`${$.auth.data.apiDomain}/api/v1/activities`, body); + } = await $.http.post('/api/v1/activities', body); $.setActionItem({ raw: data, diff --git a/packages/backend/src/apps/pipedrive/actions/create-deal/index.ts b/packages/backend/src/apps/pipedrive/actions/create-deal/index.ts index 958ca0a5..8105c240 100644 --- a/packages/backend/src/apps/pipedrive/actions/create-deal/index.ts +++ b/packages/backend/src/apps/pipedrive/actions/create-deal/index.ts @@ -236,7 +236,7 @@ export default defineAction({ const { data: { data }, - } = await $.http.post(`${$.auth.data.apiDomain}/api/v1/deals`, body); + } = await $.http.post('/api/v1/deals', body); $.setActionItem({ raw: data, diff --git a/packages/backend/src/apps/pipedrive/actions/create-lead/index.ts b/packages/backend/src/apps/pipedrive/actions/create-lead/index.ts index de07c39b..6bcef5d4 100644 --- a/packages/backend/src/apps/pipedrive/actions/create-lead/index.ts +++ b/packages/backend/src/apps/pipedrive/actions/create-lead/index.ts @@ -190,7 +190,7 @@ export default defineAction({ const { data: { data }, - } = await $.http.post(`${$.auth.data.apiDomain}/api/v1/leads`, body); + } = await $.http.post('/api/v1/leads', body); $.setActionItem({ raw: data, diff --git a/packages/backend/src/apps/pipedrive/actions/create-note/index.ts b/packages/backend/src/apps/pipedrive/actions/create-note/index.ts index 335381e1..237e28a3 100644 --- a/packages/backend/src/apps/pipedrive/actions/create-note/index.ts +++ b/packages/backend/src/apps/pipedrive/actions/create-note/index.ts @@ -197,7 +197,7 @@ export default defineAction({ const { data: { data }, - } = await $.http.post(`${$.auth.data.apiDomain}/api/v1/notes`, body); + } = await $.http.post('/api/v1/notes', body); $.setActionItem({ raw: data, diff --git a/packages/backend/src/apps/pipedrive/actions/create-organization/index.ts b/packages/backend/src/apps/pipedrive/actions/create-organization/index.ts index b31461fa..2c856ca7 100644 --- a/packages/backend/src/apps/pipedrive/actions/create-organization/index.ts +++ b/packages/backend/src/apps/pipedrive/actions/create-organization/index.ts @@ -73,10 +73,7 @@ export default defineAction({ const { data: { data }, - } = await $.http.post( - `${$.auth.data.apiDomain}/api/v1/organizations`, - body - ); + } = await $.http.post('/api/v1/organizations', body); $.setActionItem({ raw: data, diff --git a/packages/backend/src/apps/pipedrive/actions/create-person/index.ts b/packages/backend/src/apps/pipedrive/actions/create-person/index.ts index ed26859f..10878fa3 100644 --- a/packages/backend/src/apps/pipedrive/actions/create-person/index.ts +++ b/packages/backend/src/apps/pipedrive/actions/create-person/index.ts @@ -142,7 +142,7 @@ export default defineAction({ const { data: { data }, - } = await $.http.post(`${$.auth.data.apiDomain}/api/v1/persons`, body); + } = await $.http.post('/api/v1/persons', body); $.setActionItem({ raw: data, diff --git a/packages/backend/src/apps/pipedrive/common/set-base-url.ts b/packages/backend/src/apps/pipedrive/common/set-base-url.ts new file mode 100644 index 00000000..f9900b90 --- /dev/null +++ b/packages/backend/src/apps/pipedrive/common/set-base-url.ts @@ -0,0 +1,12 @@ +import { TBeforeRequest } from '@automatisch/types'; + +const setBaseUrl: TBeforeRequest = ($, requestConfig) => { + const { apiDomain } = $.auth.data; + + if (apiDomain) { + requestConfig.baseURL = apiDomain as string; + } + + return requestConfig; +}; +export default setBaseUrl; diff --git a/packages/backend/src/apps/pipedrive/index.ts b/packages/backend/src/apps/pipedrive/index.ts index 538cd7a8..e2092db1 100644 --- a/packages/backend/src/apps/pipedrive/index.ts +++ b/packages/backend/src/apps/pipedrive/index.ts @@ -1,5 +1,6 @@ import defineApp from '../../helpers/define-app'; import addAuthHeader from './common/add-auth-header'; +import setBaseUrl from './common/set-base-url'; import auth from './auth'; import triggers from './triggers'; import actions from './actions'; @@ -14,7 +15,7 @@ export default defineApp({ authDocUrl: 'https://automatisch.io/docs/apps/pipedrive/connection', primaryColor: 'FFFFFF', supportsConnections: true, - beforeRequest: [addAuthHeader], + beforeRequest: [setBaseUrl, addAuthHeader], auth, triggers, actions, diff --git a/packages/backend/src/apps/pipedrive/triggers/new-activities/index.ts b/packages/backend/src/apps/pipedrive/triggers/new-activities/index.ts index 00547572..1224320d 100644 --- a/packages/backend/src/apps/pipedrive/triggers/new-activities/index.ts +++ b/packages/backend/src/apps/pipedrive/triggers/new-activities/index.ts @@ -32,10 +32,9 @@ export default defineTrigger({ }; do { - const { data } = await $.http.get( - `${$.auth.data.apiDomain}/api/v1/activities`, - { params } - ); + const { data } = await $.http.get('/api/v1/activities', { + params, + }); if (!data?.data?.length) { return; diff --git a/packages/backend/src/apps/pipedrive/triggers/new-deals/index.ts b/packages/backend/src/apps/pipedrive/triggers/new-deals/index.ts index 6a54a46a..3ee2439f 100644 --- a/packages/backend/src/apps/pipedrive/triggers/new-deals/index.ts +++ b/packages/backend/src/apps/pipedrive/triggers/new-deals/index.ts @@ -32,10 +32,9 @@ export default defineTrigger({ }; do { - const { data } = await $.http.get( - `${$.auth.data.apiDomain}/api/v1/deals`, - { params } - ); + const { data } = await $.http.get('/api/v1/deals', { + params, + }); if (!data?.data?.length) { return; diff --git a/packages/backend/src/apps/pipedrive/triggers/new-leads/index.ts b/packages/backend/src/apps/pipedrive/triggers/new-leads/index.ts index 76f2c063..f09933e0 100644 --- a/packages/backend/src/apps/pipedrive/triggers/new-leads/index.ts +++ b/packages/backend/src/apps/pipedrive/triggers/new-leads/index.ts @@ -32,10 +32,9 @@ export default defineTrigger({ }; do { - const { data } = await $.http.get( - `${$.auth.data.apiDomain}/api/v1/leads`, - { params } - ); + const { data } = await $.http.get('/api/v1/leads', { + params, + }); if (!data?.data?.length) { return; diff --git a/packages/backend/src/apps/pipedrive/triggers/new-notes/index.ts b/packages/backend/src/apps/pipedrive/triggers/new-notes/index.ts index b4a2e89e..155dabca 100644 --- a/packages/backend/src/apps/pipedrive/triggers/new-notes/index.ts +++ b/packages/backend/src/apps/pipedrive/triggers/new-notes/index.ts @@ -32,10 +32,9 @@ export default defineTrigger({ }; do { - const { data } = await $.http.get( - `${$.auth.data.apiDomain}/api/v1/notes`, - { params } - ); + const { data } = await $.http.get('/api/v1/notes', { + params, + }); if (!data?.data?.length) { return;