fix(integrations): seperate atlassian integrations connect and update (CM-738) (#3602)

Author: mbani01

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

@@ -4,6 +4,9 @@ import PermissionChecker from '../../../services/user/permissionChecker'
 
 export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
-  const payload = await new IntegrationService(req).confluenceConnectOrUpdate(req.body)
+  const integrationService = new IntegrationService(req)
+  const payload = req.body.id
+    ? await integrationService.updateConfluenceIntegration(req.body)
+    : await integrationService.connectConfluenceIntegration(req.body)
   await req.responseHandler.success(req, res, payload)
 }

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

@@ -4,6 +4,9 @@ import PermissionChecker from '../../../services/user/permissionChecker'
 
 export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.tenantEdit)
-  const payload = await new IntegrationService(req).jiraConnectOrUpdate(req.body)
+  const integrationService = new IntegrationService(req)
+  const payload = req.body.id
+    ? await integrationService.updateJiraIntegration(req.body)
+    : await integrationService.connectJiraIntegration(req.body)
   await req.responseHandler.success(req, res, payload)
 }

backend/src/bin/jobs/refreshGroupsioToken.ts

@@ -2,11 +2,11 @@ import axios, { AxiosRequestConfig, AxiosResponse } from 'axios'
 import cronGenerator from 'cron-time-generator'
 import moment from 'moment'
 
+import { decryptData } from '@crowd/common'
 import { getServiceChildLogger } from '@crowd/logging'
 
 import SequelizeRepository from '../../database/repositories/sequelizeRepository'
 import { CrowdJob } from '../../types/jobTypes'
-import { decryptData } from '../../utils/crypto'
 
 const log = getServiceChildLogger('refreshgroupsioTokenCronJob')