@app-connect/core 1.7.8 → 1.7.11

package/handlers/contact.js

@@ -1,13 +1,12 @@
 const oauth = require('../lib/oauth');
 const { UserModel } = require('../models/userModel');
-const errorMessage = require('../lib/generalErrorMessage');
 const connectorRegistry = require('../connector/registry');
 const { Connector } = require('../models/dynamo/connectorSchema');
-const { DebugTracer } = require('../lib/debugTracer');
+const { handleApiError } = require('../lib/errorHandler');
+const { AccountDataModel } = require('../models/accountDataModel');
 
-async function findContact({ platform, userId, phoneNumber, overridingFormat, isExtension, tracer }) {
+async function findContact({ platform, userId, phoneNumber, overridingFormat, isExtension, tracer, isForceRefreshAccountData = false }) {
     tracer?.trace('handler.findContact:entered', { platform, userId, phoneNumber });
-    
     try {
         let user = await UserModel.findOne({
             where: {
@@ -16,7 +15,7 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
             }
         });
         tracer?.trace('handler.findContact:userFound', { user });
-        
+
         if (!user || !user.accessToken) {
             tracer?.trace('handler.findContact:noUser', { userId });
             return {
@@ -28,6 +27,20 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
                 }
             };
         }
+        // find cached contact by composite key; findByPk expects raw PK values, so use where clause
+        const existingMatchedContactInfo = await AccountDataModel.findOne({
+            where: {
+                rcAccountId: user.rcAccountId,
+                platformName: platform,
+                dataKey: `contact-${phoneNumber}`
+            }
+        })
+        if (!isForceRefreshAccountData) {
+            if (existingMatchedContactInfo) {
+                console.log('found existing matched contact info in account data');
+                return { successful: true, returnMessage: null, contact: existingMatchedContactInfo.data, extraDataTracking: null };
+            }
+        }
         const proxyId = user.platformAdditionalInfo?.proxyId;
         let proxyConfig = null;
         if (proxyId) {
@@ -37,7 +50,7 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
         const platformModule = connectorRegistry.getConnector(platform);
         const authType = await platformModule.getAuthType({ proxyId, proxyConfig });
         tracer?.trace('handler.findContact:authType', { authType });
-        
+
         let authHeader = '';
         switch (authType) {
             case 'oauth':
@@ -52,12 +65,31 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
                 tracer?.trace('handler.findContact:apiKeyAuth', {});
                 break;
         }
-        
-        const { successful, matchedContactInfo, returnMessage, extraDataTracking } = await platformModule.findContact({ user, authHeader, phoneNumber, overridingFormat, isExtension, proxyConfig, tracer });
+
+        const { successful, matchedContactInfo, returnMessage, extraDataTracking } = await platformModule.findContact({ user, authHeader, phoneNumber, overridingFormat, isExtension, proxyConfig, tracer, isForceRefreshAccountData });
         tracer?.trace('handler.findContact:platformFindResult', { successful, matchedContactInfo });
-        
+
         if (matchedContactInfo != null && matchedContactInfo?.filter(c => !c.isNewContact)?.length > 0) {
             tracer?.trace('handler.findContact:contactsFound', { count: matchedContactInfo.length });
+            // save in org data
+            // Danger: it does NOT support one RC account mapping to multiple CRM platforms, because contacts will be shared
+            if (user.rcAccountId) {
+                if(existingMatchedContactInfo)
+                {
+                    await existingMatchedContactInfo.update({
+                        data: matchedContactInfo
+                    });
+                }
+                else{
+                    await AccountDataModel.create({
+                        rcAccountId: user.rcAccountId,
+                        platformName: platform,
+                        dataKey: `contact-${phoneNumber}`,
+                        data: matchedContactInfo
+                    });
+                }
+                console.log('store new matched contact info in account data');
+            }
             return { successful, returnMessage, contact: matchedContactInfo, extraDataTracking };
         }
         else {
@@ -93,51 +125,9 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
             };
         }
     } catch (e) {
-        console.error(`platform: ${platform} \n${e.stack} \n${JSON.stringify(e.response?.data)}`);
         tracer?.traceError('handler.findContact:error', e, { platform, statusCode: e.response?.status });
-        
-        if (e.response?.status === 429) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.rateLimitErrorMessage({ platform }),
-                extraDataTracking: {
-                    statusCode: e.response?.status,
-                }
-            };
-        }
-        else if (e.response?.status >= 400 && e.response?.status < 410) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.authorizationErrorMessage({ platform }),
-                extraDataTracking: {
-                    statusCode: e.response?.status,
-                }
-            };
-        }
-        return {
-            successful: false,
-            returnMessage:
-            {
-                message: `Error finding contacts`,
-                messageType: 'warning',
-                details: [
-                    {
-                        title: 'Details',
-                        items: [
-                            {
-                                id: '1',
-                                type: 'text',
-                                text: `Please check if your account has permission to VIEW and LIST contacts`
-                            }
-                        ]
-                    }
-                ],
-                ttl: 5000
-            },
-            extraDataTracking: {
-                statusCode: e.response?.status,
-            }
-        };
+        return handleApiError(e, platform, 'findContact', { userId, overridingFormat, isExtension });
+
     }
 }
 
@@ -179,43 +169,7 @@ async function createContact({ platform, userId, phoneNumber, newContactName, ne
             return { successful: false, returnMessage };
         }
     } catch (e) {
-        console.log(`platform: ${platform} \n${e.stack}`);
-        if (e.response?.status === 429) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.rateLimitErrorMessage({ platform }),
-            };
-        }
-        else if (e.response?.status >= 400 && e.response?.status < 410) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.authorizationErrorMessage({ platform }),
-                extraDataTracking: {
-                    statusCode: e.response?.status,
-                }
-            };
-        }
-        return {
-            successful: false,
-            returnMessage:
-            {
-                message: `Error creating contact`,
-                messageType: 'warning',
-                details: [
-                    {
-                        title: 'Details',
-                        items: [
-                            {
-                                id: '1',
-                                type: 'text',
-                                text: `A contact with the phone number ${phoneNumber} could not be created. Make sure you have permission to create contacts in ${platform}.`
-                            }
-                        ]
-                    }
-                ],
-                ttl: 5000
-            }
-        };
+        return handleApiError(e, platform, 'createContact', { userId, phoneNumber, newContactName, newContactType, additionalSubmission });
     }
 }
 
@@ -280,28 +234,7 @@ async function findContactWithName({ platform, userId, name }) {
             };
         }
     } catch (e) {
-        console.error(`platform: ${platform} \n${e.stack} \n${JSON.stringify(e.response?.data)}`);
-        if (e.response?.status === 429) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.rateLimitErrorMessage({ platform })
-            };
-        }
-        else if (e.response?.status >= 400 && e.response?.status < 410) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.authorizationErrorMessage({ platform }),
-            };
-        }
-        return {
-            successful: false,
-            returnMessage:
-            {
-                message: `Error finding contacts`,
-                messageType: 'warning',
-                ttl: 5000
-            }
-        };
+        return handleApiError(e, platform, 'findContactWithName', { userId, name });
     }
 }
 

package/handlers/disposition.js

@@ -1,14 +1,11 @@
-// const Op = require('sequelize').Op;
 const { CallLogModel } = require('../models/callLogModel');
-// const { MessageLogModel } = require('../models/messageLogModel');
 const { UserModel } = require('../models/userModel');
 const oauth = require('../lib/oauth');
-// const userCore = require('../handlers/user');
-const errorMessage = require('../lib/generalErrorMessage');
 const connectorRegistry = require('../connector/registry');
 const { Connector } = require('../models/dynamo/connectorSchema');
+const { handleApiError } = require('../lib/errorHandler');
 
-async function upsertCallDisposition({ platform, userId, sessionId, dispositions, additionalSubmission, userSettings }) {
+async function upsertCallDisposition({ platform, userId, sessionId, dispositions }) {
     try {
         const log = await CallLogModel.findOne({
             where: {
@@ -65,143 +62,8 @@ async function upsertCallDisposition({ platform, userId, sessionId, dispositions
         return { successful: !!logId, logId, returnMessage, extraDataTracking };
     }
     catch (e) {
-        console.error(`platform: ${platform} \n${e.stack} \n${JSON.stringify(e.response?.data)}`);
-        if (e.response?.status === 429) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.rateLimitErrorMessage({ platform })
-            };
-        }
-        else if (e.response?.status >= 400 && e.response?.status < 410) {
-            return {
-                successful: false,
-                returnMessage: errorMessage.authorizationErrorMessage({ platform }),
-                extraDataTracking: {
-                    statusCode: e.response?.status,
-                }
-            };
-        }
-        return {
-            successful: false,
-            returnMessage:
-            {
-                message: `Error dispositioning call log`,
-                messageType: 'warning',
-                details: [
-                    {
-                        title: 'Details',
-                        items: [
-                            {
-                                id: '1',
-                                type: 'text',
-                                text: `Please check if your account has permission to UPDATE logs.`
-                            }
-                        ]
-                    }
-                ],
-                ttl: 5000
-            }
-        };
+        return handleApiError(e, platform, 'upsertCallDisposition', { userId, sessionId, dispositions });
     }
 }
 
-// async function upsertMessageDisposition({ platform, userId, conversationLogId, dispositions, additionalSubmission, userSettings }) {
-//     try {
-//         const existingSameDateMessageLog = await MessageLogModel.findOne({
-//             where: {
-//                 conversationLogId
-//             }
-//         });
-//         if (!existingSameDateMessageLog) {
-//             return {
-//                 successful: false,
-//                 returnMessage: {
-//                     message: `Cannot find log`,
-//                     messageType: 'warning',
-//                     ttl: 3000
-//                 }
-//             }
-//         }
-//         let user = await UserModel.findByPk(userId);
-//         if (!user) {
-//             return {
-//                 successful: false,
-//                 returnMessage: {
-//                     message: `Cannot find user`,
-//                     messageType: 'warning',
-//                     ttl: 3000
-//                 }
-//             }
-//         }
-//         const proxyId = user.platformAdditionalInfo?.proxyId;
-//         let proxyConfig = null;
-//         if (proxyId) {
-//             proxyConfig = await Connector.getProxyConfig(proxyId);
-//         }
-//         const platformModule = connectorRegistry.getConnector(platform);
-//         const authType = await platformModule.getAuthType({ proxyId, proxyConfig });
-//         let authHeader = '';
-//         switch (authType) {
-//             case 'oauth':
-//                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
-//                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
-//                 authHeader = `Bearer ${user.accessToken}`;
-//                 break;
-//             case 'apiKey':
-//                 const basicAuth = platformModule.getBasicAuth({ apiKey: user.accessToken });
-//                 authHeader = `Basic ${basicAuth}`;
-//                 break;
-//         }
-//         const { logId, returnMessage, extraDataTracking } = await platformModule.upsertMessageDisposition({
-//             user,
-//             existingMessageLog: existingSameDateMessageLog,
-//             authHeader,
-//             dispositions,
-//             proxyConfig
-//         });
-//         return { successful: !!logId, logId, returnMessage, extraDataTracking };
-//     }
-//     catch (e) {
-//         console.error(`platform: ${platform} \n${e.stack} \n${JSON.stringify(e.response?.data)}`);
-//         if (e.response?.status === 429) {
-//             return {
-//                 successful: false,
-//                 returnMessage: errorMessage.rateLimitErrorMessage({ platform })
-//             };
-//         }
-//         else if (e.response?.status >= 400 && e.response?.status < 410) {
-//             return {
-//                 successful: false,
-//                 returnMessage: errorMessage.authorizationErrorMessage({ platform }),
-//                 extraDataTracking: {
-//                     statusCode: e.response?.status,
-//                 }
-//             };
-//         }
-//         return {
-//             successful: false,
-//             returnMessage:
-//             {
-//                 message: `Error dispositioning message log`,
-//                 messageType: 'warning',
-//                 details: [
-//                     {
-//                         title: 'Details',
-//                         items: [
-//                             {
-//                                 id: '1',
-//                                 type: 'text',
-//                                 text: `Please check if your account has correct permissions.`
-//                             }
-//                         ]
-//                     }
-//                 ],
-//                 ttl: 5000
-//             }
-//         };
-//     }
-// }
-
-
-exports.upsertCallDisposition = upsertCallDisposition;
-// exports.upsertMessageDisposition = upsertMessageDisposition;
+exports.upsertCallDisposition = upsertCallDisposition;