@app-connect/core 1.7.16 → 1.7.17

package/handlers/admin.js

@@ -109,7 +109,7 @@ async function getAdminReport({ rcAccountId, timezone, timeFrom, timeTo, groupBy
         var callLogStats = [];
         var itemKeys = [];
         for (const record of callsAggregationData.data.records) {
-            if(!record?.info?.name){
+            if (!record?.info?.name) {
                 continue;
             }
             itemKeys.push(record.info.name);
@@ -238,6 +238,17 @@ async function getUserMapping({ user, hashedRcAccountId, rcExtensionList }) {
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 // eslint-disable-next-line no-param-reassign
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                if (!user) {
+                    return {
+                        successful: false,
+                        returnMessage: {
+                            message: `User session expired. Please connect again.`,
+                            messageType: 'warning',
+                            ttl: 5000
+                        },
+                        isRevokeUserSession: true
+                    }
+                }
                 authHeader = `Bearer ${user.accessToken}`;
                 break;
             case 'apiKey':
@@ -399,6 +410,17 @@ async function reinitializeUserMapping({ user, hashedRcAccountId, rcExtensionLis
             const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
             // eslint-disable-next-line no-param-reassign
             user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+            if (!user) {
+                return {
+                    successful: false,
+                    returnMessage: {
+                        message: `User session expired. Please connect again.`,
+                        messageType: 'warning',
+                        ttl: 5000
+                    },
+                    isRevokeUserSession: true
+                }
+            }
             authHeader = `Bearer ${user.accessToken}`;
             break;
         case 'apiKey':

package/handlers/contact.js

@@ -56,6 +56,17 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
             case 'oauth':
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                if (!user) {
+                    return {
+                        successful: false,
+                        returnMessage: {
+                            message: `User session expired. Please connect again.`,
+                            messageType: 'warning',
+                            ttl: 5000
+                        },
+                        isRevokeUserSession: true
+                    }
+                }
                 authHeader = `Bearer ${user.accessToken}`;
                 tracer?.trace('handler.findContact:oauthAuth', { authHeader });
                 break;
@@ -153,6 +164,17 @@ async function createContact({ platform, userId, phoneNumber, newContactName, ne
             case 'oauth':
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                if (!user) {
+                    return {
+                        successful: false,
+                        returnMessage: {
+                            message: `User session expired. Please connect again.`,
+                            messageType: 'warning',
+                            ttl: 5000
+                        },
+                        isRevokeUserSession: true
+                    }
+                }
                 authHeader = `Bearer ${user.accessToken}`;
                 break;
             case 'apiKey':
@@ -202,6 +224,17 @@ async function findContactWithName({ platform, userId, name }) {
             case 'oauth':
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                if (!user) {
+                    return {
+                        successful: false,
+                        returnMessage: {
+                            message: `User session expired. Please connect again.`,
+                            messageType: 'warning',
+                            ttl: 5000
+                        },
+                        isRevokeUserSession: true
+                    }
+                }
                 authHeader = `Bearer ${user.accessToken}`;
                 break;
             case 'apiKey':

package/handlers/disposition.js

@@ -45,6 +45,17 @@ async function upsertCallDisposition({ platform, userId, sessionId, dispositions
             case 'oauth':
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                if (!user) {
+                    return {
+                        successful: false,
+                        returnMessage: {
+                            message: `User session expired. Please connect again.`,
+                            messageType: 'warning',
+                            ttl: 5000
+                        },
+                        isRevokeUserSession: true
+                    }
+                }
                 authHeader = `Bearer ${user.accessToken}`;
                 break;
             case 'apiKey':

package/handlers/log.js

@@ -13,6 +13,7 @@ const moment = require('moment');
 const { getMediaReaderLinkByPlatformMediaLink } = require('../lib/util');
 const logger = require('../lib/logger');
 const { handleApiError, handleDatabaseError } = require('../lib/errorHandler');
+const { AccountDataModel } = require('../models/accountDataModel');
 
 async function createCallLog({ platform, userId, incomingData, hashedAccountId, isFromSSCL }) {
     try {
@@ -77,6 +78,17 @@ async function createCallLog({ platform, userId, incomingData, hashedAccountId,
             case 'oauth':
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                if (!user) {
+                    return {
+                        successful: false,
+                        returnMessage: {
+                            message: `User session expired. Please connect again.`,
+                            messageType: 'warning',
+                            ttl: 5000
+                        },
+                        isRevokeUserSession: true
+                    }
+                }
                 authHeader = `Bearer ${user.accessToken}`;
                 break;
             case 'apiKey':
@@ -206,6 +218,17 @@ async function getCallLog({ userId, sessionIds, platform, requireDetails }) {
                 case 'oauth':
                     const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                     user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                    if (!user) {
+                        return {
+                            successful: false,
+                            returnMessage: {
+                                message: `User session expired. Please connect again.`,
+                                messageType: 'warning',
+                                ttl: 5000
+                            },
+                            isRevokeUserSession: true
+                        }
+                    }
                     authHeader = `Bearer ${user.accessToken}`;
                     break;
                 case 'apiKey':
@@ -292,6 +315,17 @@ async function updateCallLog({ platform, userId, incomingData, hashedAccountId,
                 case 'oauth':
                     const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                     user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                    if (!user) {
+                        return {
+                            successful: false,
+                            returnMessage: {
+                                message: `User session expired. Please connect again.`,
+                                messageType: 'warning',
+                                ttl: 5000
+                            },
+                            isRevokeUserSession: true
+                        }
+                    }
                     authHeader = `Bearer ${user.accessToken}`;
                     break;
                 case 'apiKey':
@@ -382,7 +416,7 @@ async function updateCallLog({ platform, userId, incomingData, hashedAccountId,
                 isFromSSCL,
                 proxyConfig,
             });
-            if(!extraDataTracking){
+            if (!extraDataTracking) {
                 extraDataTracking = {};
             }
             extraDataTracking.withSmartNoteLog = !!incomingData.aiNote;
@@ -442,6 +476,17 @@ async function createMessageLog({ platform, userId, incomingData }) {
             case 'oauth':
                 const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
                 user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                if (!user) {
+                    return {
+                        successful: false,
+                        returnMessage: {
+                            message: `User session expired. Please connect again.`,
+                            messageType: 'warning',
+                            ttl: 5000
+                        },
+                        isRevokeUserSession: true
+                    }
+                }
                 authHeader = `Bearer ${user.accessToken}`;
                 break;
             case 'apiKey':
@@ -467,12 +512,33 @@ async function createMessageLog({ platform, userId, incomingData }) {
             type: incomingData.contactType ?? "",
             name: incomingData.contactName ?? ""
         };
+        const isGroupSMS = incomingData.logInfo.correspondents.length > 1;
         // For shared SMS
         const assigneeName = incomingData.logInfo.assignee?.name;
         const ownerName = incomingData.logInfo.owner?.name;
         const isSharedSMS = !!ownerName;
 
-        const messageIds = incomingData.logInfo.messages.map(m => { return { id: m.id.toString() }; });
+        let messageIds = [];
+        const correspondents = [];
+        if (isGroupSMS) {
+            messageIds = incomingData.logInfo.messages.map(m => { return { id: m.id.toString() + `-${incomingData.contactId}` }; });
+            for (var i = 0; i < incomingData.logInfo.correspondents.length; i++) {
+                // find cached contact by composite key; findByPk expects raw PK values, so use where clause
+                const correspondentContactInfo = await AccountDataModel.findOne({
+                    where: {
+                        rcAccountId: user.rcAccountId,
+                        platformName: platform,
+                        dataKey: `contact-${incomingData.logInfo.correspondents[i].phoneNumber}`
+                    }
+                })
+                if (correspondentContactInfo && correspondentContactInfo.data[0]?.name != incomingData.contactName) {
+                    correspondents.push(correspondentContactInfo.data);
+                }
+            }
+        }
+        else {
+            messageIds = incomingData.logInfo.messages.map(m => { return { id: m.id.toString() }; });
+        }
         let existingMessages = null;
         try {
             existingMessages = await MessageLogModel.findAll({
@@ -520,9 +586,18 @@ async function createMessageLog({ platform, userId, incomingData }) {
         }
         // Case: normal SMS
         else {
+            if (isGroupSMS) {
+                // eslint-disable-next-line no-param-reassign
+                incomingData.logInfo.conversationLogId = incomingData.logInfo.conversationLogId + `-${incomingData.contactId}`;
+                // eslint-disable-next-line no-param-reassign
+                incomingData.logInfo.conversationId = incomingData.logInfo.conversationId + `-${incomingData.contactId}`;
+            }
             // reverse the order of messages to log the oldest message first
             const reversedMessages = incomingData.logInfo.messages.reverse();
             for (const message of reversedMessages) {
+                if (isGroupSMS) {
+                    message.id = message.id.toString() + `-${incomingData.contactId}`;
+                }
                 if (existingIds.includes(message.id.toString())) {
                     continue;
                 }
@@ -532,14 +607,14 @@ async function createMessageLog({ platform, userId, incomingData }) {
                 }
                 let faxDocLink = null;
                 let faxDownloadLink = null;
-                if (message.attachments && message.attachments.some(a => a.type === 'RenderedDocument')) {
+                if (message.attachments && message.attachments.some(a => a.type === 'RenderedDocument') && incomingData.logInfo.rcAccessToken) {
                     faxDocLink = message.attachments.find(a => a.type === 'RenderedDocument').link;
                     faxDownloadLink = message.attachments.find(a => a.type === 'RenderedDocument').uri + `?access_token=${incomingData.logInfo.rcAccessToken}`
                 }
                 let imageLink = null;
                 let imageDownloadLink = null;
                 let imageContentType = null;
-                if (message.attachments && message.attachments.some(a => a.type === 'MmsAttachment' && a.contentType.startsWith('image/'))) {
+                if (message.attachments && message.attachments.some(a => a.type === 'MmsAttachment' && a.contentType.startsWith('image/')) && incomingData.logInfo.rcAccessToken) {
                     const imageAttachment = message.attachments.find(a => a.type === 'MmsAttachment' && a.contentType.startsWith('image/'));
                     if (imageAttachment) {
                         imageLink = getMediaReaderLinkByPlatformMediaLink(imageAttachment?.uri);
@@ -563,15 +638,15 @@ async function createMessageLog({ platform, userId, incomingData }) {
                         conversationLogId: incomingData.logInfo.conversationLogId
                     }
                 });
-            let crmLogId = ''
+                let crmLogId = ''
                 if (existingSameDateMessageLog) {
-                    const updateMessageResult = await platformModule.updateMessageLog({ user, contactInfo, assigneeName, ownerName, existingMessageLog: existingSameDateMessageLog, message, authHeader, additionalSubmission, imageLink, videoLink, proxyConfig });
+                    const updateMessageResult = await platformModule.updateMessageLog({ user, contactInfo, assigneeName, ownerName, existingMessageLog: existingSameDateMessageLog, message, authHeader, additionalSubmission, imageLink, imageDownloadLink, imageContentType, videoLink, proxyConfig });
                     crmLogId = existingSameDateMessageLog.thirdPartyLogId;
                     returnMessage = updateMessageResult?.returnMessage;
                     extraDataTracking = updateMessageResult.extraDataTracking;
                 }
                 else {
-                    const createMessageLogResult = await platformModule.createMessageLog({ user, contactInfo, assigneeName, ownerName, authHeader, message, additionalSubmission, recordingLink, faxDocLink, faxDownloadLink, imageLink, imageDownloadLink, imageContentType, videoLink, proxyConfig });
+                    const createMessageLogResult = await platformModule.createMessageLog({ user, contactInfo, correspondents, assigneeName, ownerName, authHeader, message, additionalSubmission, recordingLink, faxDocLink, faxDownloadLink, imageLink, imageDownloadLink, imageContentType, videoLink, proxyConfig });
                     crmLogId = createMessageLogResult.logId;
                     returnMessage = createMessageLogResult?.returnMessage;
                     extraDataTracking = createMessageLogResult.extraDataTracking;

package/index.js

@@ -333,7 +333,7 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('setAdminSettings:adminValidationFailed', {});
-                res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
                 success = false;
             }
         }
@@ -395,7 +395,7 @@ function createCoreRouter() {
                 }
                 else {
                     tracer?.trace('getAdminSettings:adminValidationFailed', {});
-                    res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                    res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
                     success = true;
                 }
             }
@@ -447,12 +447,18 @@ function createCoreRouter() {
                 const hashedRcAccountId = util.getHashValue(rcAccountId, process.env.HASH_KEY);
                 if (isValidated) {
                     const userMapping = await adminCore.getUserMapping({ user, hashedRcAccountId, rcExtensionList: req.body.rcExtensionList });
-                    res.status(200).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
-                    success = true;
+                    if (userMapping?.isRevokeUserSession) {
+                        res.status(401).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        success = false;
+                    }
+                    else {
+                        res.status(200).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        success = true;
+                    }
                 }
                 else {
                     tracer?.trace('getUserMapping:adminValidationFailed', {});
-                    res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                    res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
                     success = true;
                 }
             }
@@ -504,12 +510,18 @@ function createCoreRouter() {
                 const hashedRcAccountId = util.getHashValue(rcAccountId, process.env.HASH_KEY);
                 if (isValidated) {
                     const userMapping = await adminCore.reinitializeUserMapping({ user, hashedRcAccountId, rcExtensionList: req.body.rcExtensionList });
-                    res.status(200).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
-                    success = true;
+                    if (userMapping?.isRevokeUserSession) {
+                        res.status(401).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        success = false;
+                    }
+                    else {
+                        res.status(200).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        success = true;
+                    }
                 }
                 else {
                     tracer?.trace('reinitializeUserMapping:adminValidationFailed', {});
-                    res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                    res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
                     success = true;
                 }
             }
@@ -825,8 +837,7 @@ function createCoreRouter() {
             const stateParams = new URLSearchParams(state ? decodeURIComponent(state) : '');
             platformName = stateParams.get('platform');
             // backward compatibility
-            if(!platformName)
-            {
+            if (!platformName) {
                 platformName = req.query.callbackUri?.split('platform=')[1] ?? state.split('platform=')[1];
             }
             // Extract mcp auth sessionId if present
@@ -870,7 +881,7 @@ function createCoreRouter() {
                     res.status(200).send("Authentication successful. Please go back to AI Agent and confirm it.");
                     success = true;
                 }
-                else {                
+                else {
                     res.status(200).send(tracer ? tracer.wrapResponse({ jwtToken, name: userInfo.name, returnMessage }) : { jwtToken, name: userInfo.name, returnMessage });
                     success = true;
                 }
@@ -1057,7 +1068,7 @@ function createCoreRouter() {
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, returnMessage, contact, extraDataTracking } = await contactCore.findContact({
+                const { successful, returnMessage, contact, extraDataTracking, isRevokeUserSession } = await contactCore.findContact({
                     platform,
                     userId,
                     phoneNumber: req.query.phoneNumber.replace(' ', '+'),
@@ -1066,15 +1077,21 @@ function createCoreRouter() {
                     tracer,
                     isForceRefreshAccountData: req.query?.isForceRefreshAccountData === 'true'
                 });
-                tracer?.trace('findContact:result', { successful, returnMessage, contact });
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
-                if (successful) {
-                    const nonNewContact = contact?.filter(c => !c.isNewContact) ?? [];
-                    resultCount = nonNewContact.length;
+                if (isRevokeUserSession) {
+                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = false;
                 }
-                success = successful;
-                if (extraDataTracking) {
-                    extraData = extraDataTracking;
+                else {
+                    tracer?.trace('findContact:result', { successful, returnMessage, contact });
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
+                    if (successful) {
+                        const nonNewContact = contact?.filter(c => !c.isNewContact) ?? [];
+                        resultCount = nonNewContact.length;
+                    }
+                    success = successful;
+                    if (extraDataTracking) {
+                        extraData = extraDataTracking;
+                    }
                 }
             }
             else {
@@ -1128,11 +1145,17 @@ function createCoreRouter() {
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, returnMessage, contact, extraDataTracking } = await contactCore.createContact({ platform, userId, phoneNumber: req.body.phoneNumber, newContactName: req.body.newContactName, newContactType: req.body.newContactType, additionalSubmission: req.body.additionalSubmission });
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
-                success = true;
-                if (extraDataTracking) {
-                    extraData = extraDataTracking;
+                const { successful, returnMessage, contact, extraDataTracking, isRevokeUserSession } = await contactCore.createContact({ platform, userId, phoneNumber: req.body.phoneNumber, newContactName: req.body.newContactName, newContactType: req.body.newContactType, additionalSubmission: req.body.additionalSubmission });
+                if (isRevokeUserSession) {
+                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = false;
+                }
+                else {
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
+                    success = true;
+                    if (extraDataTracking) {
+                        extraData = extraDataTracking;
+                    }
                 }
             }
             else {
@@ -1236,13 +1259,19 @@ function createCoreRouter() {
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, logs, returnMessage, extraDataTracking } = await logCore.getCallLog({ userId, sessionIds: req.query.sessionIds, platform, requireDetails: req.query.requireDetails === 'true' });
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, logs, returnMessage }) : { successful, logs, returnMessage });
-                success = true;
-                if (extraDataTracking) {
-                    extraData = extraDataTracking;
+                const { successful, logs, returnMessage, extraDataTracking, isRevokeUserSession } = await logCore.getCallLog({ userId, sessionIds: req.query.sessionIds, platform, requireDetails: req.query.requireDetails === 'true' });
+                if (isRevokeUserSession) {
+                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = false;
+                }
+                else {
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, logs, returnMessage }) : { successful, logs, returnMessage });
+                    success = true;
+                    if (extraDataTracking) {
+                        extraData = extraDataTracking;
+                    }
+                    extraData.requireDetails = req.query.requireDetails === 'true';
                 }
-                extraData.requireDetails = req.query.requireDetails === 'true';
             }
             else {
                 tracer?.trace('getCallLog:noToken', {});
@@ -1294,12 +1323,18 @@ function createCoreRouter() {
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, logId, returnMessage, extraDataTracking } = await logCore.createCallLog({ platform, userId, incomingData: req.body, hashedAccountId: hashedAccountId ?? util.getHashValue(req.body.logInfo?.accountId, process.env.HASH_KEY), isFromSSCL: userAgent === 'SSCL' });
-                if (extraDataTracking) {
-                    extraData = extraDataTracking;
+                const { successful, logId, returnMessage, extraDataTracking, isRevokeUserSession } = await logCore.createCallLog({ platform, userId, incomingData: req.body, hashedAccountId: hashedAccountId ?? util.getHashValue(req.body.logInfo?.accountId, process.env.HASH_KEY), isFromSSCL: userAgent === 'SSCL' });
+                if (isRevokeUserSession) {
+                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = false;
+                }
+                else {
+                    if (extraDataTracking) {
+                        extraData = extraDataTracking;
+                    }
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, logId, returnMessage }) : { successful, logId, returnMessage });
+                    success = true;
                 }
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, logId, returnMessage }) : { successful, logId, returnMessage });
-                success = true;
             }
             else {
                 tracer?.trace('createCallLog:noToken', {});
@@ -1407,18 +1442,24 @@ function createCoreRouter() {
                     res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
-                const { successful, returnMessage, extraDataTracking } = await dispositionCore.upsertCallDisposition({
+                const { successful, returnMessage, extraDataTracking, isRevokeUserSession } = await dispositionCore.upsertCallDisposition({
                     platform,
                     userId,
                     sessionId: req.body.sessionId,
                     dispositions: req.body.dispositions,
                     additionalSubmission: req.body.additionalSubmission
                 });
-                if (extraDataTracking) {
-                    extraData = extraDataTracking;
+                if (isRevokeUserSession) {
+                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = false;
+                }
+                else {
+                    if (extraDataTracking) {
+                        extraData = extraDataTracking;
+                    }
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = true;
                 }
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
-                success = true;
             }
             else {
                 tracer?.trace('upsertCallDisposition:noToken', {});
@@ -1471,12 +1512,18 @@ function createCoreRouter() {
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, returnMessage, logIds, extraDataTracking } = await logCore.createMessageLog({ platform, userId, incomingData: req.body });
-                if (extraDataTracking) {
-                    extraData = extraDataTracking;
+                const { successful, returnMessage, logIds, extraDataTracking, isRevokeUserSession } = await logCore.createMessageLog({ platform, userId, incomingData: req.body });
+                if (isRevokeUserSession) {
+                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = false;
+                }
+                else {
+                    if (extraDataTracking) {
+                        extraData = extraDataTracking;
+                    }
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, logIds }) : { successful, returnMessage, logIds });
+                    success = true;
                 }
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, logIds }) : { successful, returnMessage, logIds });
-                success = true;
             }
             else {
                 tracer?.trace('createMessageLog:noToken', {});
@@ -1707,9 +1754,15 @@ function createCoreRouter() {
             if (jwtToken) {
                 const { id: userId, platform } = jwt.decodeJwt(jwtToken);
                 platformName = platform;
-                const { successful, returnMessage, contact } = await contactCore.findContactWithName({ platform, userId, name: req.query.name });
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
-                success = successful;
+                const { successful, returnMessage, contact, isRevokeUserSession } = await contactCore.findContactWithName({ platform, userId, name: req.query.name });
+                if (isRevokeUserSession) {
+                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    success = false;
+                }
+                else {
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
+                    success = successful;
+                }
             }
             else {
                 tracer?.trace('contactSearchByName:noToken', {});
@@ -1896,7 +1949,7 @@ function createCoreRouter() {
                 res.status(200).send(mockUser ? 'Mock user registered' : 'Mock user already existed');
             }
             else {
-                res.status(401).send('Unauthorized');
+                res.status(403).send('Unauthorized');
             }
         });
         router.delete('/deleteMockUser', async function (req, res) {
@@ -1906,7 +1959,7 @@ function createCoreRouter() {
                 res.status(200).send(foundAndDeleted ? 'Mock user deleted' : 'Mock user not found');
             }
             else {
-                res.status(401).send('Unauthorized');
+                res.status(403).send('Unauthorized');
             }
         });
         router.get('/mockCallLog', async function (req, res) {
@@ -1916,7 +1969,7 @@ function createCoreRouter() {
                 res.status(200).send(callLogs);
             }
             else {
-                res.status(401).send('Unauthorized');
+                res.status(403).send('Unauthorized');
             }
         });
         router.post('/mockCallLog', async function (req, res) {
@@ -1926,7 +1979,7 @@ function createCoreRouter() {
                 res.status(200).send('Mock call log created');
             }
             else {
-                res.status(401).send('Unauthorized');
+                res.status(403).send('Unauthorized');
             }
         });
         router.delete('/mockCallLog', async function (req, res) {
@@ -1936,7 +1989,7 @@ function createCoreRouter() {
                 res.status(200).send('Mock call logs cleaned up');
             }
             else {
-                res.status(401).send('Unauthorized');
+                res.status(403).send('Unauthorized');
             }
         });
     }
@@ -1944,7 +1997,7 @@ function createCoreRouter() {
     router.get('/.well-known/openai-apps-challenge', (req, res) => {
         res.send(process.env.CHATGPT_VERIFICATION_CODE);
     });
-    
+
     // --- METADATA ENDPOINT 1: Resource Metadata ---
     // Tells the client "I am protected" and "Here is who protects me"
     router.get('/.well-known/oauth-protected-resource', (req, res) => {

package/lib/oauth.js

@@ -101,41 +101,48 @@ async function checkAndRefreshAccessToken(oauthApp, user, tokenLockTimeout = 20)
             try {
                 const startRefreshTime = moment();
                 const token = oauthApp.createToken(user.accessToken, user.refreshToken);
-            logger.info('token refreshing...')
+                logger.info('token refreshing...')
                 const { accessToken, refreshToken, expires } = await token.refresh();
                 user.accessToken = accessToken;
                 user.refreshToken = refreshToken;
                 user.tokenExpiry = expires;
-            try {
-                await user.save();
-            }
-            catch (error) {
-                return handleDatabaseError(error, 'Error saving user');
-            }
+                try {
+                    await user.save();
+                }
+                catch (error) {
+                    return handleDatabaseError(error, 'Error saving user');
+                }
                 if (newLock) {
                     const deletionStartTime = moment();
                     await newLock.delete();
                     const deletionEndTime = moment();
-                logger.info(`lock deleted in ${deletionEndTime.diff(deletionStartTime)}ms`)
+                    logger.info(`lock deleted in ${deletionEndTime.diff(deletionStartTime)}ms`)
                 }
                 const endRefreshTime = moment();
-            logger.info(`token refreshing finished in ${endRefreshTime.diff(startRefreshTime)}ms`)
+                logger.info(`token refreshing finished in ${endRefreshTime.diff(startRefreshTime)}ms`)
             }
             catch (e) {
                 console.log('token refreshing failed', e.stack)
                 if (newLock) {
                     await newLock.delete();
                 }
+                return null;
             }
         }
         // case: run withou token refresh lock
         else {
-            logger.info('token refreshing...')
-            const token = oauthApp.createToken(user.accessToken, user.refreshToken);
-            const { accessToken, refreshToken, expires } = await token.refresh();
-            user.accessToken = accessToken;
-            user.refreshToken = refreshToken;
-            user.tokenExpiry = expires;
+            try {
+                logger.info('token refreshing...')
+                const token = oauthApp.createToken(user.accessToken, user.refreshToken);
+                const { accessToken, refreshToken, expires } = await token.refresh();
+                user.accessToken = accessToken;
+                user.refreshToken = refreshToken;
+                user.tokenExpiry = expires;
+            }
+            catch (e) {
+                console.log('token refreshing failed', e.stack)
+                return null;
+            }
             try {
                 await user.save();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@app-connect/core",
-  "version": "1.7.16",
+  "version": "1.7.17",
   "description": "RingCentral App Connect Core",
   "main": "index.js",
   "repository": {

package/releaseNotes.json

@@ -1,4 +1,20 @@
 {
+    "1.7.17": {
+        "global": [
+            {
+                "type": "New",
+                "description": "Support for Group SMS logging"
+            },
+            {
+                "type": "Better",
+                "description": "User session will log be revoked is token refresh fails"
+            },
+            {
+                "type": "Fix",
+                "description": "Contact call pop issue"
+            }
+        ]
+    },
     "1.7.16": {
         "global": [
             {

package/test/handlers/log.test.js

@@ -29,6 +29,7 @@ const logHandler = require('../../handlers/log');
 const { CallLogModel } = require('../../models/callLogModel');
 const { MessageLogModel } = require('../../models/messageLogModel');
 const { UserModel } = require('../../models/userModel');
+const { AccountDataModel } = require('../../models/accountDataModel');
 const connectorRegistry = require('../../connector/registry');
 const oauth = require('../../lib/oauth');
 const { composeCallLog } = require('../../lib/callLogComposer');
@@ -40,12 +41,14 @@ describe('Log Handler', () => {
     await CallLogModel.sync({ force: true });
     await MessageLogModel.sync({ force: true });
     await UserModel.sync({ force: true });
+    await AccountDataModel.sync({ force: true });
   });
 
   afterEach(async () => {
     await CallLogModel.destroy({ where: {} });
     await MessageLogModel.destroy({ where: {} });
     await UserModel.destroy({ where: {} });
+    await AccountDataModel.destroy({ where: {} });
     jest.clearAllMocks();
   });
 
@@ -742,6 +745,228 @@ describe('Log Handler', () => {
       expect(mockConnector.createMessageLog).toHaveBeenCalledTimes(0);
       expect(mockConnector.updateMessageLog).toHaveBeenCalledTimes(1);
     });
+
+    test('should handle group SMS with contactId suffix for message IDs', async () => {
+      // Arrange - group SMS has multiple correspondents
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-group-123',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-group-1', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-group-123',
+          conversationLogId: 'conv-log-group-123'
+        },
+        contactId: 'contact-456',
+        contactType: 'Contact',
+        contactName: 'Primary Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      const result = await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert
+      expect(result.successful).toBe(true);
+      expect(result.logIds).toContain('msg-group-1-contact-456');
+      const savedLog = await MessageLogModel.findOne({ where: { id: 'msg-group-1-contact-456' } });
+      expect(savedLog).not.toBeNull();
+      expect(savedLog.thirdPartyLogId).toBe('msg-log-group-123');
+    });
+
+    test('should pass correspondents to createMessageLog when group SMS has different contact names', async () => {
+      // Arrange - correspondent in cache with different name
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      await AccountDataModel.create({
+        rcAccountId: 'rc-account-123',
+        platformName: 'testCRM',
+        dataKey: 'contact-+0987654321',
+        data: [{ name: 'Other Contact', id: 'contact-789' }]
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-correspondents',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-correspondents', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-correspondents',
+          conversationLogId: 'conv-log-correspondents'
+        },
+        contactId: 'contact-456',
+        contactType: 'Contact',
+        contactName: 'Primary Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert - createMessageLog should receive correspondents with different name
+      expect(mockConnector.createMessageLog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          correspondents: [[{ name: 'Other Contact', id: 'contact-789' }]]
+        })
+      );
+    });
+
+    test('should not add correspondent when name matches contactName in group SMS', async () => {
+      // Arrange - correspondent in cache with same name as contactName
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      await AccountDataModel.create({
+        rcAccountId: 'rc-account-123',
+        platformName: 'testCRM',
+        dataKey: 'contact-+0987654321',
+        data: [{ name: 'Primary Contact', id: 'contact-789' }]
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-same-name',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-same-name', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-same-name',
+          conversationLogId: 'conv-log-same-name'
+        },
+        contactId: 'contact-456',
+        contactType: 'Contact',
+        contactName: 'Primary Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert - correspondents should be empty when names match
+      expect(mockConnector.createMessageLog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          correspondents: []
+        })
+      );
+    });
+
+    test('should use suffixed conversationLogId and conversationId for group SMS', async () => {
+      // Arrange
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-suffix',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-suffix', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-original',
+          conversationLogId: 'conv-log-original'
+        },
+        contactId: 'contact-999',
+        contactType: 'Contact',
+        contactName: 'Test Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      const result = await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert - message log saved with suffixed conversationLogId
+      expect(result.successful).toBe(true);
+      const savedLog = await MessageLogModel.findOne({ where: { id: 'msg-suffix-contact-999' } });
+      expect(savedLog).not.toBeNull();
+      expect(savedLog.conversationLogId).toBe('conv-log-original-contact-999');
+      expect(savedLog.conversationId).toBe('conv-original-contact-999');
+    });
   });
 
   describe('saveNoteCache', () => {

package/test/setup.js

@@ -1,176 +1,176 @@
-// Test setup for @app-connect/core package
-const path = require('path');
-require('dotenv').config({ path: path.resolve(__dirname, '../.env.test') });
-
-// Set test timeout
-jest.setTimeout(30000);
-
-// Mock console methods to reduce noise in tests
-global.console = {
-  ...console,
-  log: jest.fn(),
-  debug: jest.fn(),
-  info: jest.fn(),
-  warn: jest.fn(),
-  error: jest.fn(),
-};
-
-// Setup database models for testing
-beforeAll(async () => {
-  try {
-    // Set up test database URL if not provided
-    if (!process.env.DATABASE_URL) {
-      process.env.DATABASE_URL = 'sqlite::memory:';
-    }
-
-    // Import models
-    const { CallLogModel } = require('../models/callLogModel');
-    const { MessageLogModel } = require('../models/messageLogModel');
-    const { UserModel } = require('../models/userModel');
-    const { CacheModel } = require('../models/cacheModel');
-    const { AdminConfigModel } = require('../models/adminConfigModel');
-
-    // Sync database models
-    await CallLogModel.sync({ force: true });
-    await MessageLogModel.sync({ force: true });
-    await UserModel.sync({ force: true });
-    await CacheModel.sync({ force: true });
-    await AdminConfigModel.sync({ force: true });
-
-    console.log('Database models synced for testing');
-  } catch (error) {
-    console.error('Error setting up test database:', error);
-    // Don't fail the setup, some tests might not need database
-  }
-});
-
-// Clean up after all tests
-afterAll(async () => {
-  try {
-    // Close database connections
-    const { sequelize } = require('../models/sequelize');
-    if (sequelize) {
-      await sequelize.close();
-    }
-  } catch (error) {
-    console.error('Error closing database connection:', error);
-  }
-});
-
-// Global test utilities
-global.testUtils = {
-  // Helper to create mock user
-  createMockUser: (overrides = {}) => ({
-    id: 'test-user-id',
-    platform: 'testCRM',
-    accessToken: 'test-access-token',
-    refreshToken: 'test-refresh-token',
-    tokenExpiry: new Date(Date.now() + 3600000), // 1 hour from now
-    platformUserInfo: {
-      id: 'test-platform-user-id',
-      name: 'Test User',
-      timezoneName: 'America/Los_Angeles',
-      timezoneOffset: 0,
-      platformAdditionalInfo: {}
-    },
-    ...overrides
-  }),
-
-  // Helper to create mock call log
-  createMockCallLog: (overrides = {}) => ({
-    id: 'test-call-log-id',
-    userId: 'test-user-id',
-    platform: 'testCRM',
-    thirdPartyLogId: 'test-third-party-id',
-    contactId: 'test-contact-id',
-    contactType: 'Contact',
-    phoneNumber: '+1234567890',
-    callDirection: 'Inbound',
-    callResult: 'Answered',
-    callDuration: 120,
-    callStartTime: new Date(),
-    callEndTime: new Date(Date.now() + 120000),
-    recordingLink: 'https://example.com/recording.mp3',
-    subject: 'Test Call',
-    note: 'Test call note',
-    ...overrides
-  }),
-
-  // Helper to create mock contact
-  createMockContact: (overrides = {}) => ({
-    id: 'test-contact-id',
-    name: 'Test Contact',
-    type: 'Contact',
-    phone: '+1234567890',
-    additionalInfo: null,
-    ...overrides
-  }),
-
-  // Helper to reset connector registry
-  resetConnectorRegistry: () => {
-    const connectorRegistry = require('../connector/registry');
-    connectorRegistry.connectors.clear();
-    connectorRegistry.manifests.clear();
-    connectorRegistry.platformInterfaces.clear();
-    connectorRegistry.releaseNotes = {};
-  },
-
-  // Helper to create mock connector
-  createMockConnector: (overrides = {}) => ({
-    getAuthType: jest.fn().mockReturnValue('apiKey'),
-    getUserInfo: jest.fn().mockResolvedValue({
-      successful: true,
-      platformUserInfo: {
-        id: 'test-user-id',
-        name: 'Test User',
-        timezoneName: 'America/Los_Angeles',
-        timezoneOffset: 0,
-        platformAdditionalInfo: {}
-      }
-    }),
-    createCallLog: jest.fn().mockResolvedValue({
-      logId: 'test-log-id',
-      returnMessage: {
-        message: 'Call logged successfully',
-        messageType: 'success',
-        ttl: 2000
-      }
-    }),
-    updateCallLog: jest.fn().mockResolvedValue({
-      updatedNote: 'Call log updated',
-      returnMessage: {
-        message: 'Call log updated successfully',
-        messageType: 'success',
-        ttl: 2000
-      }
-    }),
-    unAuthorize: jest.fn().mockResolvedValue({
-      returnMessage: {
-        messageType: 'success',
-        message: 'Logged out successfully',
-        ttl: 1000
-      }
-    }),
-    findContact: jest.fn().mockResolvedValue([
-      {
-        id: 'test-contact-id',
-        name: 'Test Contact',
-        type: 'Contact',
-        phone: '+1234567890',
-        additionalInfo: null
-      }
-    ]),
-    createContact: jest.fn().mockResolvedValue({
-      contactInfo: {
-        id: 'new-contact-id',
-        name: 'New Contact'
-      },
-      returnMessage: {
-        message: 'Contact created successfully',
-        messageType: 'success',
-        ttl: 2000
-      }
-    }),
-    ...overrides
-  })
-};
+// Test setup for @app-connect/core package
+const path = require('path');
+require('dotenv').config({ path: path.resolve(__dirname, '../.env.test') });
+
+// Set test timeout
+jest.setTimeout(30000);
+
+// Mock console methods to reduce noise in tests
+global.console = {
+  ...console,
+  log: jest.fn(),
+  debug: jest.fn(),
+  info: jest.fn(),
+  warn: jest.fn(),
+  error: jest.fn(),
+};
+
+// Setup database models for testing
+beforeAll(async () => {
+  try {
+    // Set up test database URL if not provided
+    if (!process.env.DATABASE_URL) {
+      process.env.DATABASE_URL = 'sqlite::memory:';
+    }
+
+    // Import models
+    const { CallLogModel } = require('../models/callLogModel');
+    const { MessageLogModel } = require('../models/messageLogModel');
+    const { UserModel } = require('../models/userModel');
+    const { CacheModel } = require('../models/cacheModel');
+    const { AdminConfigModel } = require('../models/adminConfigModel');
+
+    // Sync database models
+    await CallLogModel.sync({ force: true });
+    await MessageLogModel.sync({ force: true });
+    await UserModel.sync({ force: true });
+    await CacheModel.sync({ force: true });
+    await AdminConfigModel.sync({ force: true });
+
+    console.log('Database models synced for testing');
+  } catch (error) {
+    console.error('Error setting up test database:', error);
+    // Don't fail the setup, some tests might not need database
+  }
+});
+
+// Clean up after all tests
+afterAll(async () => {
+  try {
+    // Close database connections
+    const { sequelize } = require('../models/sequelize');
+    if (sequelize) {
+      await sequelize.close();
+    }
+  } catch (error) {
+    console.error('Error closing database connection:', error);
+  }
+});
+
+// Global test utilities
+global.testUtils = {
+  // Helper to create mock user
+  createMockUser: (overrides = {}) => ({
+    id: 'test-user-id',
+    platform: 'testCRM',
+    accessToken: 'test-access-token',
+    refreshToken: 'test-refresh-token',
+    tokenExpiry: new Date(Date.now() + 3600000), // 1 hour from now
+    platformUserInfo: {
+      id: 'test-platform-user-id',
+      name: 'Test User',
+      timezoneName: 'America/Los_Angeles',
+      timezoneOffset: 0,
+      platformAdditionalInfo: {}
+    },
+    ...overrides
+  }),
+
+  // Helper to create mock call log
+  createMockCallLog: (overrides = {}) => ({
+    id: 'test-call-log-id',
+    userId: 'test-user-id',
+    platform: 'testCRM',
+    thirdPartyLogId: 'test-third-party-id',
+    contactId: 'test-contact-id',
+    contactType: 'Contact',
+    phoneNumber: '+1234567890',
+    callDirection: 'Inbound',
+    callResult: 'Answered',
+    callDuration: 120,
+    callStartTime: new Date(),
+    callEndTime: new Date(Date.now() + 120000),
+    recordingLink: 'https://example.com/recording.mp3',
+    subject: 'Test Call',
+    note: 'Test call note',
+    ...overrides
+  }),
+
+  // Helper to create mock contact
+  createMockContact: (overrides = {}) => ({
+    id: 'test-contact-id',
+    name: 'Test Contact',
+    type: 'Contact',
+    phone: '+1234567890',
+    additionalInfo: null,
+    ...overrides
+  }),
+
+  // Helper to reset connector registry
+  resetConnectorRegistry: () => {
+    const connectorRegistry = require('../connector/registry');
+    connectorRegistry.connectors.clear();
+    connectorRegistry.manifests.clear();
+    connectorRegistry.platformInterfaces.clear();
+    connectorRegistry.releaseNotes = {};
+  },
+
+  // Helper to create mock connector
+  createMockConnector: (overrides = {}) => ({
+    getAuthType: jest.fn().mockReturnValue('apiKey'),
+    getUserInfo: jest.fn().mockResolvedValue({
+      successful: true,
+      platformUserInfo: {
+        id: 'test-user-id',
+        name: 'Test User',
+        timezoneName: 'America/Los_Angeles',
+        timezoneOffset: 0,
+        platformAdditionalInfo: {}
+      }
+    }),
+    createCallLog: jest.fn().mockResolvedValue({
+      logId: 'test-log-id',
+      returnMessage: {
+        message: 'Call logged successfully',
+        messageType: 'success',
+        ttl: 2000
+      }
+    }),
+    updateCallLog: jest.fn().mockResolvedValue({
+      updatedNote: 'Call log updated',
+      returnMessage: {
+        message: 'Call log updated successfully',
+        messageType: 'success',
+        ttl: 2000
+      }
+    }),
+    unAuthorize: jest.fn().mockResolvedValue({
+      returnMessage: {
+        messageType: 'success',
+        message: 'Logged out successfully',
+        ttl: 1000
+      }
+    }),
+    findContact: jest.fn().mockResolvedValue([
+      {
+        id: 'test-contact-id',
+        name: 'Test Contact',
+        type: 'Contact',
+        phone: '+1234567890',
+        additionalInfo: null
+      }
+    ]),
+    createContact: jest.fn().mockResolvedValue({
+      contactInfo: {
+        id: 'new-contact-id',
+        name: 'New Contact'
+      },
+      returnMessage: {
+        message: 'Contact created successfully',
+        messageType: 'success',
+        ttl: 2000
+      }
+    }),
+    ...overrides
+  })
+};