@app-connect/core 1.7.11 → 1.7.15

package/handlers/admin.js

@@ -377,6 +377,95 @@ async function getUserMapping({ user, hashedRcAccountId, rcExtensionList }) {
     return [];
 }
 
+async function reinitializeUserMapping({ user, hashedRcAccountId, rcExtensionList }) {
+    const platformModule = connectorRegistry.getConnector(user.platform);
+    if (!platformModule.getUserList) {
+        return [];
+    }
+
+    const proxyId = user.platformAdditionalInfo?.proxyId;
+    let proxyConfig = null;
+    if (proxyId) {
+        proxyConfig = await Connector.getProxyConfig(proxyId);
+        if (!proxyConfig?.operations?.getUserList) {
+            return [];
+        }
+    }
+
+    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 })));
+            // eslint-disable-next-line no-param-reassign
+            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 crmUserList = await platformModule.getUserList({ user, authHeader, proxyConfig });
+    const userMappingResult = [];
+    const initialUserMappings = [];
+
+    // Auto-match CRM users with RC extensions by email or name
+    for (const crmUser of crmUserList) {
+        const rcExtensionForMapping = rcExtensionList.find(u =>
+            u.email === crmUser.email ||
+            u.name === crmUser.name ||
+            (`${u.firstName} ${u.lastName}` === crmUser.name)
+        );
+
+        if (rcExtensionForMapping) {
+            userMappingResult.push({
+                crmUser: {
+                    id: crmUser.id,
+                    name: crmUser.name ?? '',
+                    email: crmUser.email ?? '',
+                },
+                rcUser: [{
+                    extensionId: rcExtensionForMapping.id,
+                    name: rcExtensionForMapping.name || `${rcExtensionForMapping.firstName} ${rcExtensionForMapping.lastName}`,
+                    extensionNumber: rcExtensionForMapping?.extensionNumber ?? '',
+                    email: rcExtensionForMapping?.email ?? ''
+                }]
+            });
+            initialUserMappings.push({
+                crmUserId: crmUser.id.toString(),
+                rcExtensionId: [rcExtensionForMapping.id.toString()]
+            });
+        }
+        else {
+            userMappingResult.push({
+                crmUser: {
+                    id: crmUser.id,
+                    name: crmUser.name ?? '',
+                    email: crmUser.email ?? '',
+                },
+                rcUser: []
+            });
+        }
+    }
+
+    // Overwrite existing mappings with fresh auto-matched mappings
+    try {
+        await upsertAdminSettings({
+            hashedRcAccountId,
+            adminSettings: {
+                userMappings: initialUserMappings
+            }
+        });
+    }
+    catch (error) {
+        return handleDatabaseError(error, 'Error reinitializing user mapping');
+    }
+
+    return userMappingResult;
+}
+
 exports.validateAdminRole = validateAdminRole;
 exports.upsertAdminSettings = upsertAdminSettings;
 exports.getAdminSettings = getAdminSettings;
@@ -385,4 +474,5 @@ exports.getServerLoggingSettings = getServerLoggingSettings;
 exports.updateServerLoggingSettings = updateServerLoggingSettings;
 exports.getAdminReport = getAdminReport;
 exports.getUserReport = getUserReport;
-exports.getUserMapping = getUserMapping;
+exports.getUserMapping = getUserMapping;
+exports.reinitializeUserMapping = reinitializeUserMapping;

package/handlers/auth.js

@@ -36,9 +36,9 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, isFromMCP
         overridingOAuthOption = platformModule.getOverridingOAuthOption({ code });
     }
     const oauthApp = oauth.getOAuthApp(oauthInfo);
-    const { accessToken, refreshToken, expires } = await oauthApp.code.getToken(callbackUri, overridingOAuthOption);
+    const { accessToken, refreshToken, expires, data } = await oauthApp.code.getToken(callbackUri, overridingOAuthOption);
     const authHeader = `Bearer ${accessToken}`;
-    const { successful, platformUserInfo, returnMessage } = await platformModule.getUserInfo({ authHeader, tokenUrl, apiUrl, hostname, platform, username, callbackUri, query, proxyId, proxyConfig, userEmail });
+    const { successful, platformUserInfo, returnMessage } = await platformModule.getUserInfo({ authHeader, tokenUrl, apiUrl, hostname, platform, username, callbackUri, query, proxyId, proxyConfig, userEmail, data });
 
     if (successful) {
         let userInfo = null;
@@ -52,7 +52,7 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, isFromMCP
                 hostname: platformUserInfo?.overridingHostname ? platformUserInfo.overridingHostname : hostname,
                 accessToken,
                 refreshToken,
-                tokenExpiry: expires,
+                tokenExpiry: isNaN(expires) ? null : expires,
                 rcAccountId: query?.rcAccountId,
                 proxyId
             });

package/handlers/disposition.js

@@ -7,12 +7,12 @@ const { handleApiError } = require('../lib/errorHandler');
 
 async function upsertCallDisposition({ platform, userId, sessionId, dispositions }) {
     try {
-        const log = await CallLogModel.findOne({
+        const existingCallLog = await CallLogModel.findOne({
             where: {
                 sessionId
             }
         });
-        if (!log) {
+        if (!existingCallLog) {
             return {
                 successful: false,
                 returnMessage: {
@@ -54,7 +54,7 @@ async function upsertCallDisposition({ platform, userId, sessionId, dispositions
         }
         const { logId, returnMessage, extraDataTracking } = await platformModule.upsertCallDisposition({
             user,
-            existingCallLog: log,
+            existingCallLog,
             authHeader,
             dispositions,
             proxyConfig

package/handlers/log.js

@@ -225,7 +225,7 @@ async function getCallLog({ userId, sessionIds, platform, requireDetails }) {
                     logs.push({ sessionId: sId, matched: false });
                 }
                 else {
-                    const getCallLogResult = await platformModule.getCallLog({ user, callLogId: callLog.thirdPartyLogId, contactId: callLog.contactId, authHeader, proxyConfig });
+                    const getCallLogResult = await platformModule.getCallLog({ user, telephonySessionId: callLog.id, callLogId: callLog.thirdPartyLogId, contactId: callLog.contactId, authHeader, proxyConfig });
                     returnMessage = getCallLogResult.returnMessage;
                     extraDataTracking = getCallLogResult.extraDataTracking;
                     logs.push({ sessionId: callLog.sessionId, matched: true, logId: callLog.thirdPartyLogId, logData: getCallLogResult.callLogInfo });
@@ -304,6 +304,7 @@ async function updateCallLog({ platform, userId, incomingData, hashedAccountId,
                 try {
                     const getLogResult = await platformModule.getCallLog({
                         user,
+                        telephonySessionId: existingCallLog.id,
                         callLogId: existingCallLog.thirdPartyLogId,
                         contactId: existingCallLog.contactId,
                         authHeader,

package/index.js

@@ -482,6 +482,63 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
+    router.post('/admin/reinitializeUserMapping', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
+        tracer?.trace('reinitializeUserMapping:start', { body: req.body });
+        let platformName = null;
+        let success = false;
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        try {
+            const jwtToken = req.query.jwtToken;
+            if (jwtToken) {
+                const unAuthData = jwt.decodeJwt(jwtToken);
+                platformName = unAuthData?.platform ?? 'Unknown';
+                const user = await UserModel.findByPk(unAuthData?.id);
+                if (!user) {
+                    tracer?.trace('reinitializeUserMapping:userNotFound', {});
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    return;
+                }
+                const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+                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;
+                }
+                else {
+                    tracer?.trace('reinitializeUserMapping:adminValidationFailed', {});
+                    res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                    success = true;
+                }
+            }
+            else {
+                tracer?.trace('reinitializeUserMapping:noToken', {});
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                success = false;
+            }
+        }
+        catch (e) {
+            logger.error('Reinitialize user mapping failed', { stack: e.stack });
+            tracer?.traceError('reinitializeUserMapping:error', e);
+            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Reinitialize user mapping',
+            interfaceName: 'reinitializeUserMapping',
+            connectorName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            eventAddedVia
+        });
+    });
     router.get('/admin/serverLoggingSettings', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -767,6 +824,11 @@ function createCoreRouter() {
             const state = new URL(req.query.callbackUri).searchParams.get('state') ?? req.query.state;
             const stateParams = new URLSearchParams(state ? decodeURIComponent(state) : '');
             platformName = stateParams.get('platform');
+            // backward compatibility
+            if(!platformName)
+            {
+                platformName = req.query.callbackUri?.split('platform=')[1] ?? state.split('platform=')[1];
+            }
             // Extract mcp auth sessionId if present
             sessionId = stateParams?.get('sessionId');
             const isFromMCP = !!sessionId;
@@ -1878,6 +1940,11 @@ function createCoreRouter() {
             }
         });
     }
+    // For chatGPT verification
+    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/sharedSMSComposer.js

@@ -373,7 +373,7 @@ function composeHTMLBody({ conversationCreatedDate, conversationUpdatedDate, con
     // Owner/Call queue info
     if (ownerInfo) {
         if (ownerInfo.type === 'callQueue') {
-            body += `<div>Receiving call queue: <b>${escapeHtml(ownerInfo.name)}</b>, ext. &lt;extension&gt;</div><br>`;
+            body += `<div>Receiving call queue: <b>${escapeHtml(ownerInfo.name)}</b></div><br>`;
         } else {
             body += `<div>Owner: <b>${escapeHtml(ownerInfo.name)}</b></div><br>`;
         }
@@ -422,7 +422,7 @@ function composeMarkdownBody({ conversationCreatedDate, conversationUpdatedDate,
     // Owner/Call queue info
     if (ownerInfo) {
         if (ownerInfo.type === 'callQueue') {
-            body += `Receiving call queue: **${ownerInfo.name}**, ext. \\<extension\\>\n\n`;
+            body += `Receiving call queue: **${ownerInfo.name}**\n\n`;
         } else {
             body += `Owner: **${ownerInfo.name}**\n\n`;
         }

package/mcp/tools/checkAuthStatus.js

@@ -15,9 +15,18 @@ const toolDefinition = {
             sessionId: {
                 type: 'string',
                 description: 'The session ID returned from doAuth tool'
+            },
+            platform: {
+                type: 'string',
+                description: 'The platform to check the status of'
             }
         },
         required: ['sessionId']
+    },
+    annotations: {
+        readOnlyHint: true,
+        openWorldHint: false,
+        destructiveHint: false
     }
 };
 
@@ -29,7 +38,7 @@ const toolDefinition = {
  */
 async function execute(args) {
     try {
-        const { sessionId } = args;
+        const { sessionId, platform } = args;
         
         const session = await getAuthSession(sessionId);
         
@@ -45,13 +54,24 @@ async function execute(args) {
         
         switch (session.status) {
             case 'completed':
+                if(platform === 'googleSheets') {
+                    return {
+                        success: true,
+                        data: {
+                            status: 'completed',
+                            jwtToken: session.jwtToken,
+                            userInfo: session.userInfo,
+                            message: 'IMPORTANT: Authentication successful! Keep jwtToken in memory for future use. DO NOT directly show it to user. Next step is to call getGoogleFilePicker tool.'
+                        }
+                    };
+                }
                 return {
                     success: true,
                     data: {
                         status: 'completed',
                         jwtToken: session.jwtToken,
                         userInfo: session.userInfo,
-                        message: 'IMPORTANT: Authentication successful! Keep jwtToken in memory for future use.'
+                        message: 'IMPORTANT: Authentication successful! Keep jwtToken in memory for future use. DO NOT directly show it to user.'
                     }
                 };
             

package/mcp/tools/collectAuthInfo.js

@@ -31,6 +31,11 @@ const toolDefinition = {
             }
         },
         required: ['connectorManifest', 'connectorName']
+    },
+    annotations: {
+        readOnlyHint: true,
+        openWorldHint: false,
+        destructiveHint: false
     }
 };
 

package/mcp/tools/createCallLog.js

@@ -163,6 +163,11 @@ const toolDefinition = {
             }
         },
         required: ['jwtToken', 'incomingData']
+    },
+    annotations: {
+        readOnlyHint: false,
+        openWorldHint: true,
+        destructiveHint: false
     }
 };
 
@@ -255,10 +260,14 @@ async function execute(args) {
             else {
                 return {
                     success: false,
+                    message: 'Cannot find the contact. Please create the contact first.',
                     error: 'Failed to get contact with number ' + contactNumber
                 }
             }
         }
+        else {
+            incomingData.contactId = contactId;
+        }
 
         // Call the createCallLog method
         const { successful, logId, returnMessage } = await logCore.createCallLog({

package/mcp/tools/createContact.js

@@ -0,0 +1,117 @@
+const jwt = require('../../lib/jwt');
+const connectorRegistry = require('../../connector/registry');
+const contactCore = require('../../handlers/contact');
+
+/**
+ * MCP Tool: Create Contact
+ * 
+ * This tool creates a new contact in the CRM platform.
+ */
+
+const toolDefinition = {
+    name: 'createContact',
+    description: '⚠️ REQUIRES AUTHENTICATION: User must first authenticate using the "auth" tool to obtain a JWT token before using this tool. | Create a new contact in the CRM platform. Returns the created contact information if successful.',
+    inputSchema: {
+        type: 'object',
+        properties: {
+            jwtToken: {
+                type: 'string',
+                description: 'JWT token containing userId and platform information. If user does not have this, direct them to use the "auth" tool first.'
+            },
+            phoneNumber: {
+                type: 'string',
+                description: 'Phone number of the new contact (MUST BE in E.164 format, e.g., +14155551234)'
+            },
+            newContactName: {
+                type: 'string',
+                description: 'Full name of the new contact. If not provided, use phone number as the name'
+            }
+        },
+        required: ['jwtToken', 'phoneNumber']
+    },
+    annotations: {
+        readOnlyHint: false,
+        openWorldHint: true,
+        destructiveHint: false
+    }
+};
+
+/**
+ * Execute the createContact tool
+ * @param {Object} args - The tool arguments
+ * @param {string} args.jwtToken - JWT token with user and platform info
+ * @param {string} args.phoneNumber - Phone number of the new contact
+ * @param {string} args.newContactName - Name of the new contact
+ * @returns {Object} Result object with created contact information
+ */
+async function execute(args) {
+    try {
+        const { jwtToken, phoneNumber, newContactName } = args;
+
+        if (!jwtToken) {
+            throw new Error('Please go to Settings and authorize CRM platform');
+        }
+
+        if (!phoneNumber) {
+            throw new Error('Phone number is required');
+        }
+
+        if (!newContactName) {
+            throw new Error('Contact name is required');
+        }
+
+        // Decode JWT to get userId and platform
+        const { id: userId, platform } = jwt.decodeJwt(jwtToken);
+
+        if (!userId) {
+            throw new Error('Invalid JWT token: userId not found');
+        }
+
+        // Get the platform connector module
+        const platformModule = connectorRegistry.getConnector(platform);
+
+        if (!platformModule) {
+            throw new Error(`Platform connector not found for: ${platform}`);
+        }
+
+        // Check if createContact is implemented
+        if (!platformModule.createContact) {
+            throw new Error(`createContact is not implemented for platform: ${platform}`);
+        }
+
+        // Call the createContact method
+        const { successful, returnMessage, contact } = await contactCore.createContact({
+            platform,
+            userId,
+            phoneNumber,
+            newContactName
+        });
+
+        if (successful) {
+            return {
+                success: true,
+                data: {
+                    contact,
+                    message: returnMessage?.message || 'Contact created successfully'
+                }
+            };
+        }
+        else {
+            return {
+                success: false,
+                error: returnMessage?.message || 'Failed to create contact'
+            };
+        }
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error.message || 'Unknown error occurred',
+            errorDetails: error.stack
+        };
+    }
+}
+
+exports.definition = toolDefinition;
+exports.execute = execute;
+

package/mcp/tools/doAuth.js

@@ -55,6 +55,11 @@ const toolDefinition = {
             }
         },
         required: ['connectorManifest', 'connectorName', 'hostname']
+    },
+    annotations: {
+        readOnlyHint: false,
+        openWorldHint: true,
+        destructiveHint: true
     }
 };
 
@@ -93,7 +98,7 @@ async function execute(args) {
                         success: true,
                         data: {
                             jwtToken,
-                            message: "IMPORTANT: Authentication successful. Keep jwtToken in memory for future use.",
+                            message: "IMPORTANT: Authentication successful. Keep jwtToken in memory for future use. DO NOT directly show it to user.",
                         }
                     }
                 }
@@ -119,7 +124,7 @@ async function execute(args) {
                             success: true,
                             data: {
                                 jwtToken,
-                                message: "IMPORTANT: Authentication successful. Keep jwtToken in memory for future use.",
+                                message: "IMPORTANT: Authentication successful. Keep jwtToken in memory for future use. DO NOT directly show it to user.",
                             }
                         }
                     }
@@ -163,21 +168,21 @@ async function execute(args) {
 }
 
 function composeAuthUri({ platform, sessionId, hostname }) {
-    let customState = '';
-    if (platform.auth.oauth.customState) {
-        customState = platform.auth.oauth.customState;
-    }
-    
-    // Include sessionId in state if provided
-    const stateParam = sessionId ? 
+    // Build base state param
+    let stateParam = sessionId ? 
         `sessionId=${sessionId}&platform=${platform.name}&hostname=${hostname}` : 
         `platform=${platform.name}&hostname=${hostname}`;
     
+    // Merge customState if provided
+    if (platform.auth.oauth.customState) {
+        stateParam += `&${platform.auth.oauth.customState}`;
+    }
+    
     return `${platform.auth.oauth.authUrl}?` +
         `response_type=code` +
         `&client_id=${platform.auth.oauth.clientId}` +
         `${!!platform.auth.oauth.scope && platform.auth.oauth.scope != '' ? `&${platform.auth.oauth.scope}` : ''}` +
-        `&state=${customState === '' ? encodeURIComponent(stateParam) : customState}` +
+        `&state=${encodeURIComponent(stateParam)}` +
         `&redirect_uri=${process.env.APP_SERVER}/oauth-callback`;
 }
 

package/mcp/tools/findContactByName.js

@@ -25,6 +25,11 @@ const toolDefinition = {
             }
         },
         required: ['jwtToken', 'name']
+    },
+    annotations: {
+        readOnlyHint: true,
+        openWorldHint: true,
+        destructiveHint: false
     }
 };
 

package/mcp/tools/findContactByPhone.js

@@ -33,6 +33,11 @@ const toolDefinition = {
             }
         },
         required: ['jwtToken', 'phoneNumber']
+    },
+    annotations: {
+        readOnlyHint: true,
+        openWorldHint: true,
+        destructiveHint: false
     }
 };
 

package/mcp/tools/getGoogleFilePicker.js

@@ -0,0 +1,103 @@
+const jwt = require('../../lib/jwt');
+const { UserModel } = require('../../models/userModel');
+const axios = require('axios');
+
+/**
+ * MCP Tool: Get Google File Picker
+ * 
+ * Returns the URL for the Google Sheets file picker.
+ * The user must visit this URL in a browser to select a Google Sheet.
+ */
+
+const toolDefinition = {
+    name: 'getGoogleFilePicker',
+    description: '⚠️ REQUIRES AUTHENTICATION: User must first authenticate with googleSheets platform. | Returns a URL for the Google Sheets file picker (1st preference) OR create a new sheet with input sheet name (2nd preference). The user should open this URL in their browser to select a Google Sheet for logging.',
+    inputSchema: {
+        type: 'object',
+        properties: {
+            jwtToken: {
+                type: 'string',
+                description: 'JWT token obtained from authentication. If user does not have this, direct them to use the "doAuth" tool first with googleSheets platform.'
+            },
+            sheetName: {
+                type: 'string',
+                description: 'OPTIONAL. Name of the new sheet to create.'
+            }
+        },
+        required: ['jwtToken']
+    },
+    annotations: {
+        readOnlyHint: false,
+        openWorldHint: true,
+        destructiveHint: false
+    }
+};
+
+/**
+ * Execute the getGoogleFilePicker tool
+ * @param {Object} args - The tool arguments
+ * @param {string} args.jwtToken - JWT token containing userId
+ * @param {string} args.sheetName - Name of the new sheet to create
+ * @returns {Object} Result object with file picker URL
+ */
+async function execute(args) {
+    try {
+        const { jwtToken, sheetName } = args;
+
+        if (!jwtToken) {
+            return {
+                success: false,
+                error: 'JWT token is required. Please authenticate with googleSheets platform first using the doAuth tool.'
+            };
+        }
+
+        // Decode JWT to get userId
+        const unAuthData = jwt.decodeJwt(jwtToken);
+
+        if (!unAuthData?.id) {
+            return {
+                success: false,
+                error: 'Invalid JWT token: userId not found'
+            };
+        }
+
+        // Find the user
+        const user = await UserModel.findByPk(unAuthData.id);
+
+        if (!user) {
+            return {
+                success: false,
+                error: 'User not found. Please authenticate with googleSheets platform first.'
+            };
+        }
+
+
+        if (sheetName) {
+            const createSheetResponse = await axios.post(`${process.env.APP_SERVER}/googleSheets/sheet?jwtToken=${jwtToken}`, { name: sheetName });
+            return createSheetResponse.data;
+        }
+        else {
+            // Generate the file picker URL
+            const filePickerUrl = `${process.env.APP_SERVER}/googleSheets/filePicker?token=${jwtToken}}`;
+
+            return {
+                success: true,
+                data: {
+                    filePickerUrl,
+                    message: 'Please open this URL in a browser to select a Google Sheet. After selecting a sheet, it will be configured for logging your calls and messages.'
+                }
+            };
+        }
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error.message || 'Unknown error occurred',
+            errorDetails: error.stack
+        };
+    }
+}
+
+exports.definition = toolDefinition;
+exports.execute = execute;
+