Merge branch 'main' of https://github.com/IrishAfrican/Panora into Ir…

…ishAfrican-main

.gitignore

@@ -13,4 +13,5 @@ redis_data
 .pnpm-store/
 .npmrc
 .vscode
-docs/objects
+docs/objects
+.magicodeignore

packages/api/package.json

@@ -52,7 +52,6 @@
     "class-validator": "^0.14.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "crypto": "^1.0.1",
     "dotenv": "^16.3.1",
     "exponential-backoff": "^3.1.1",
     "form-data": "^4.0.0",

packages/api/src/crm/company/services/hubspot/index.ts

@@ -44,7 +44,7 @@ export class HubspotService implements ICompanyService {
         properties: companyData,
       };
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/companies`,
+        `${connection.account_url}/crm/v3/objects/companies`,
         JSON.stringify(dataBody),
         {
           headers: {
@@ -78,7 +78,7 @@ export class HubspotService implements ICompanyService {
 
       const commonPropertyNames = Object.keys(commonCompanyHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = `${connection.account_url}/v3/objects/companies`;
+      const baseURL = `${connection.account_url}/crm/v3/objects/companies`;
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)
         .join('&');

packages/api/src/crm/contact/services/hubspot/index.ts

@@ -1,19 +1,18 @@
-import { Injectable } from '@nestjs/common';
-import { IContactService } from '@crm/contact/types';
-import { CrmObject } from '@crm/@lib/@types';
-import axios from 'axios';
-import { PrismaService } from '@@core/@core-services/prisma/prisma.service';
-import { LoggerService } from '@@core/@core-services/logger/logger.service';
-import { ActionType, handle3rdPartyServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/@core-services/encryption/encryption.service';
+import { LoggerService } from '@@core/@core-services/logger/logger.service';
+import { PrismaService } from '@@core/@core-services/prisma/prisma.service';
 import { ApiResponse } from '@@core/utils/types';
+import { SyncParam } from '@@core/utils/types/interface';
+import { CrmObject } from '@crm/@lib/@types';
+import { IContactService } from '@crm/contact/types';
+import { Injectable } from '@nestjs/common';
+import axios from 'axios';
 import { ServiceRegistry } from '../registry.service';
 import {
   commonHubspotProperties,
   HubspotContactInput,
   HubspotContactOutput,
 } from './types';
-import { SyncParam } from '@@core/utils/types/interface';
 
 @Injectable()
 export class HubspotService implements IContactService {
@@ -45,7 +44,7 @@ export class HubspotService implements IContactService {
         properties: contactData,
       };
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/contacts`,
+        `${connection.account_url}/crm/v3/objects/contacts`,
         JSON.stringify(dataBody),
         {
           headers: {
@@ -80,7 +79,7 @@ export class HubspotService implements IContactService {
 
       const commonPropertyNames = Object.keys(commonHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = `${connection.account_url}/v3/objects/contacts`;
+      const baseURL = `${connection.account_url}/crm/v3/objects/contacts`;
 
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)

packages/api/src/crm/deal/services/hubspot/index.ts

@@ -1,19 +1,18 @@
-import { Injectable } from '@nestjs/common';
-import { IDealService } from '@crm/deal/types';
-import { CrmObject } from '@crm/@lib/@types';
-import axios from 'axios';
-import { PrismaService } from '@@core/@core-services/prisma/prisma.service';
-import { LoggerService } from '@@core/@core-services/logger/logger.service';
-import { ActionType, handle3rdPartyServiceError } from '@@core/utils/errors';
 import { EncryptionService } from '@@core/@core-services/encryption/encryption.service';
+import { LoggerService } from '@@core/@core-services/logger/logger.service';
+import { PrismaService } from '@@core/@core-services/prisma/prisma.service';
 import { ApiResponse } from '@@core/utils/types';
+import { SyncParam } from '@@core/utils/types/interface';
+import { CrmObject } from '@crm/@lib/@types';
+import { IDealService } from '@crm/deal/types';
+import { Injectable } from '@nestjs/common';
+import axios from 'axios';
 import { ServiceRegistry } from '../registry.service';
 import {
   HubspotDealInput,
   HubspotDealOutput,
   commonDealHubspotProperties,
 } from './types';
-import { SyncParam } from '@@core/utils/types/interface';
 @Injectable()
 export class HubspotService implements IDealService {
   constructor(
@@ -43,7 +42,7 @@ export class HubspotService implements IDealService {
         properties: dealData,
       };
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/deals`,
+        `${connection.account_url}/crm/v3/objects/deals`,
         JSON.stringify(dataBody),
         {
           headers: {
@@ -82,7 +81,7 @@ export class HubspotService implements IDealService {
 
       const commonPropertyNames = Object.keys(commonDealHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = `${connection.account_url}/v3/objects/deals`;
+      const baseURL = `${connection.account_url}/crm/v3/objects/deals`;
 
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)

packages/api/src/crm/engagement/services/hubspot/index.ts

@@ -81,7 +81,7 @@ export class HubspotService implements IEngagementService {
         properties: engagementData,
       };
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/calls`,
+        `${connection.account_url}/crm/v3/objects/calls`,
         JSON.stringify(dataBody),
         {
           headers: {
@@ -118,7 +118,7 @@ export class HubspotService implements IEngagementService {
         properties: engagementData,
       };
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/meetings`,
+        `${connection.account_url}/crm/v3/objects/meetings`,
         JSON.stringify(dataBody),
         {
           headers: {
@@ -155,7 +155,7 @@ export class HubspotService implements IEngagementService {
         properties: engagementData,
       };
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/emails`,
+        `${connection.account_url}/crm/v3/objects/emails`,
         JSON.stringify(dataBody),
         {
           headers: {
@@ -207,7 +207,7 @@ export class HubspotService implements IEngagementService {
 
       const commonPropertyNames = Object.keys(commonCallHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = 'https://api.hubapi.com/crm/v3/objects/calls';
+      const baseURL = `${connection.account_url}/crm/v3/objects/call`;
 
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)
@@ -250,7 +250,7 @@ export class HubspotService implements IEngagementService {
 
       const commonPropertyNames = Object.keys(commonMeetingHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = 'https://api.hubapi.com/crm/v3/objects/meetings';
+      const baseURL = `${connection.account_url}/crm/v3/objects/meeting`;
 
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)
@@ -290,7 +290,7 @@ export class HubspotService implements IEngagementService {
 
       const commonPropertyNames = Object.keys(commonEmailHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = 'https://api.hubapi.com/crm/v3/objects/emails';
+      const baseURL = `${connection.account_url}/crm/v3/objects/emails`;
 
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)

packages/api/src/crm/note/services/hubspot/index.ts

@@ -40,7 +40,7 @@ export class HubspotService implements INoteService {
         },
       });
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/notes`,
+        `${connection.account_url}/crm/v3/objects/notes`,
         JSON.stringify(noteData),
         {
           headers: {
@@ -53,7 +53,7 @@ export class HubspotService implements INoteService {
       );
 
       const final_resp = await axios.get(
-        `${connection.account_url}/v3/objects/notes/${resp.data.id}?properties=hs_note_body&associations=deal,contact,company`,
+        `${connection.account_url}/crm/v3/objects/notes/${resp.data.id}?properties=hs_note_body&associations=deal,contact,company`,
         {
           headers: {
             'Content-Type': 'application/json',
@@ -87,7 +87,7 @@ export class HubspotService implements INoteService {
 
       const commonPropertyNames = Object.keys(commonNoteHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = `${connection.account_url}/v3/objects/notes`;
+      const baseURL = `${connection.account_url}/crm/v3/objects/notes`;
 
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)

packages/api/src/crm/task/services/hubspot/index.ts

@@ -40,7 +40,7 @@ export class HubspotService implements ITaskService {
         },
       });
       const resp = await axios.post(
-        `${connection.account_url}/v3/objects/tasks`,
+        `${connection.account_url}/crm/v3/objects/tasks`,
         JSON.stringify(taskData),
         {
           headers: {
@@ -52,7 +52,7 @@ export class HubspotService implements ITaskService {
         },
       );
       const final_resp = await axios.get(
-        `${connection.account_url}/v3/objects/tasks/${resp.data.id}?properties=hs_task_body&associations=deal,company`,
+        `${connection.account_url}/crm/v3/objects/tasks/${resp.data.id}?properties=hs_task_body&associations=deal,company`,
         {
           headers: {
             'Content-Type': 'application/json',
@@ -86,7 +86,7 @@ export class HubspotService implements ITaskService {
 
       const commonPropertyNames = Object.keys(commonTaskHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = `${connection.account_url}/v3/objects/tasks`;
+      const baseURL = `${connection.account_url}/crm/v3/objects/tasks`;
 
       const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)

packages/api/src/crm/user/services/hubspot/index.ts

@@ -38,7 +38,7 @@ export class HubspotService implements IUserService {
 
       const commonPropertyNames = Object.keys(commonUserHubspotProperties);
       const allProperties = [...commonPropertyNames, ...custom_properties];
-      const baseURL = `${connection.account_url}/v3/owners`;
+      const baseURL = `${connection.account_url}/crm/v3/owners`;
 
       /*const queryString = allProperties
         .map((prop) => `properties=${encodeURIComponent(prop)}`)

packages/shared/src/connectors/metadata.ts

@@ -10,7 +10,7 @@ export const CONNECTORS_METADATA: ProvidersConfig = {
         urls: {
           docsUrl: 'https://developers.hubspot.com/docs/api/crm/understanding-the-crm',
           authBaseUrl: 'https://app-eu1.hubspot.com/oauth/authorize',
-          apiUrl: 'https://api.hubapi.com/crm',
+          apiUrl: 'https://api.hubapi.com',
           customPropertiesUrl: 'https://api.hubapi.com/properties/v1/contacts/properties',
         },
         logoPath: 'https://assets-global.website-files.com/6421a177cdeeaf3c6791b745/64d61202dd99e63d40d446f6_hubspot%20logo.png',