Merge branch 'main' into improvement/bulk-edit-member-attributes

Author: skwowet

.github/workflows/production-deploy-new.yaml

@@ -7,6 +7,10 @@ on:
         description: Deploy search-sync-worker service?
         required: true
         type: boolean
+      deploy_integration_sync_worker:
+        description: Deploy integration-sync-worker service?
+        required: true
+        type: boolean
 
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -41,6 +45,27 @@ jobs:
         id: image
         run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
 
+  build-and-push-integration-sync-worker:
+    runs-on: ubuntu-latest
+    if: ${{ inputs.deploy_integration_sync_worker }}
+    outputs:
+      image: ${{ steps.image.outputs.IMAGE }}
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/build-docker-image
+        id: image-builder
+        with:
+          image: integration-sync-worker
+
+      - name: Set docker image output
+        id: image
+        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
+
   deploy-search-sync-worker:
     needs: build-and-push-search-sync-worker
     runs-on: ubuntu-latest
@@ -58,3 +83,21 @@ jobs:
           service: search-sync-worker
           image: ${{ needs.build-and-push-search-sync-worker.outputs.image }}
           cluster: ${{ env.CROWD_CLUSTER }}
+
+  deploy-integration-sync-worker:
+    needs: build-and-push-integration-sync-worker
+    runs-on: ubuntu-latest
+    if: ${{ inputs.deploy_integration_sync_worker }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/deploy-service
+        with:
+          service: integration-sync-worker
+          image: ${{ needs.build-and-push-integration-sync-worker.outputs.image }}
+          cluster: ${{ env.CROWD_CLUSTER }}

.github/workflows/staging-deploy-integration-sync-worker.yaml

@@ -0,0 +1,60 @@
+name: Staging Deploy Integration Sync Worker
+
+on:
+  push:
+    branches:
+      - 'staging/**'
+      - 'staging-**'
+    paths:
+      - 'services/libs/**'
+      - 'services/apps/integration_sync_worker/**'
+
+env:
+  DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+  DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+  CROWD_CLUSTER: ${{ secrets.STAGING_CLUSTER_NAME }}
+  CROWD_ROLE_ARN: ${{ secrets.STAGING_CLUSTER_ROLE_ARN }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_REGION: ${{ secrets.AWS_REGION }}
+  SLACK_CHANNEL: deploys-staging
+  SLACK_WEBHOOK: ${{ secrets.STAGING_SLACK_CHANNEL_HOOK }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    outputs:
+      image: ${{ steps.image.outputs.IMAGE }}
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/build-docker-image
+        id: image-builder
+        with:
+          image: integration-sync-worker
+
+      - name: Set docker image output
+        id: image
+        run: echo "IMAGE=${{ steps.image-builder.outputs.image }}" >> $GITHUB_OUTPUT
+
+  deploy-integration-sync-worker:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - uses: ./.github/actions/deploy-service
+        with:
+          service: integration-sync-worker
+          image: ${{ needs.build-and-push.outputs.image }}
+          cluster: ${{ env.CROWD_CLUSTER }}

backend/.env.dist.local

@@ -128,7 +128,7 @@ CROWD_STACKEXCHANGE_KEY=
 # Nango settings
 CROWD_NANGO_URL=http://localhost:3003
 CROWD_NANGO_SECRET_KEY=424242
-CROWD_NANGO_INTEGRATIONS=reddit,linkedin,stackexchange
+CROWD_NANGO_INTEGRATIONS=reddit,linkedin,stackexchange,hubspot
 
 # Cohere settings
 CROWD_COHERE_API_KEY=

backend/config/custom-environment-variables.json

@@ -137,6 +137,11 @@
   "stackexchange": {
     "key": "CROWD_STACKEXCHANGE_KEY"
   },
+  "hubspot": {
+    "appId": "CROWD_HUBSPOT_APP_ID",
+    "clientId": "CROWD_HUBSPOT_CLIENT_ID",
+    "clientSecret": "CROWD_HUBSPOT_CLIENT_SECRET"
+  },
   "nango": {
     "url": "CROWD_NANGO_URL",
     "secretKey": "CROWD_NANGO_SECRET_KEY"

backend/src/api/integration/helpers/hubspotConnect.ts

@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
+  const payload = await new IntegrationService(req).hubspotConnect()
+  await req.responseHandler.success(req, res, payload)
+}

backend/src/api/integration/helpers/hubspotGetMappableFields.ts

@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
+  const payload = await new IntegrationService(req).hubspotGetMappableFields()
+  await req.responseHandler.success(req, res, payload)
+}

backend/src/api/integration/helpers/hubspotOnboard.ts

@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
+  const payload = await new IntegrationService(req).hubspotOnboard(req.body)
+  await req.responseHandler.success(req, res, payload)
+}

backend/src/api/integration/helpers/hubspotStopSyncMember.ts

@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.integrationEdit)
+  const payload = await new IntegrationService(req).hubspotStopSyncMember(req.body)
+  await req.responseHandler.success(req, res, payload)
+}

backend/src/api/integration/helpers/hubspotStopSyncOrganization.ts

@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.integrationEdit)
+  const payload = await new IntegrationService(req).hubspotStopSyncOrganization(req.body)
+  await req.responseHandler.success(req, res, payload)
+}

backend/src/api/integration/helpers/hubspotSyncMember.ts

@@ -0,0 +1,9 @@
+import Permissions from '../../../security/permissions'
+import IntegrationService from '../../../services/integrationService'
+import PermissionChecker from '../../../services/user/permissionChecker'
+
+export default async (req, res) => {
+  new PermissionChecker(req).validateHas(Permissions.values.integrationEdit)
+  const payload = await new IntegrationService(req).hubspotSyncMember(req.body)
+  await req.responseHandler.success(req, res, payload)
+}