@app-connect/core 1.6.4 → 1.7.0-beta.1

package/index.js

@@ -4,6 +4,8 @@ const bodyParser = require('body-parser');
 const dynamoose = require('dynamoose');
 const axios = require('axios');
 const { UserModel } = require('./models/userModel');
+const { CallDownListModel } = require('./models/callDownListModel');
+const { Op } = require('sequelize');
 const { CallLogModel } = require('./models/callLogModel');
 const { MessageLogModel } = require('./models/messageLogModel');
 const { AdminConfigModel } = require('./models/adminConfigModel');
@@ -20,6 +22,7 @@ const releaseNotes = require('./releaseNotes.json');
 const analytics = require('./lib/analytics');
 const util = require('./lib/util');
 const adapterRegistry = require('./adapter/registry');
+const calldown = require('./handlers/calldown');
 
 let packageJson = null;
 try {
@@ -44,6 +47,7 @@ async function initDB() {
         await MessageLogModel.sync();
         await AdminConfigModel.sync();
         await CacheModel.sync();
+        await CallDownListModel.sync();
     }
 }
 
@@ -331,6 +335,58 @@ function createCoreRouter() {
         });
     });
 
+    router.post('/admin/userMapping', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        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) {
+                    res.status(400).send('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.getUserMapping({ user, hashedRcAccountId, rcExtensionList: req.body.rcExtensionList });
+                    res.status(200).send(userMapping);
+                    success = true;
+                }
+                else {
+                    res.status(401).send('Admin validation failed');
+                    success = true;
+                }
+            }
+            else {
+                res.status(400).send('Please go to Settings and authorize CRM platform');
+                success = false;
+            }
+        }
+        catch (e) {
+            console.log(`${e.stack}`);
+            res.status(400).send(e);
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Get user mapping',
+            interfaceName: 'getUserMapping',
+            adapterName: 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();
         let platformName = null;
@@ -948,7 +1004,7 @@ function createCoreRouter() {
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, logId, returnMessage, extraDataTracking } = await logCore.createCallLog({ platform, userId, incomingData: req.body, isFromSSCL: userAgent === 'SSCL' });
+                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;
                 }
@@ -1000,7 +1056,7 @@ function createCoreRouter() {
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, logId, updatedNote, returnMessage, extraDataTracking } = await logCore.updateCallLog({ platform, userId, incomingData: req.body, isFromSSCL: userAgent === 'SSCL' });
+                const { successful, logId, updatedNote, returnMessage, extraDataTracking } = await logCore.updateCallLog({ platform, userId, incomingData: req.body, hashedAccountId: hashedAccountId ?? util.getHashValue(req.body.accountId, process.env.HASH_KEY), isFromSSCL: userAgent === 'SSCL' });
                 if (extraDataTracking) {
                     extraData = extraDataTracking;
                 }
@@ -1147,6 +1203,174 @@ function createCoreRouter() {
         });
     });
 
+    router.post('/calldown', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        let platformName = null;
+        let success = false;
+        let statusCode = 200;
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        try {
+            const jwtToken = req.query.jwtToken;
+            if (!jwtToken) {
+                res.status(400).send('Please go to Settings and authorize CRM platform');
+                return;
+            }
+            const { id } = await calldown.schedule({ jwtToken, rcAccessToken: req.query.rcAccessToken, body: req.body });
+            success = true;
+            res.status(200).send({ successful: true, id });
+        } catch (e) {
+            console.log(`platform: ${platformName} \n${e.stack}`);
+            statusCode = e.response?.status ?? 'unknown';
+            res.status(400).send(e);
+            success = false;
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Schedule call down',
+            interfaceName: 'scheduleCallDown',
+            adapterName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            extras: {
+                statusCode
+            },
+            eventAddedVia
+        });
+    });
+
+
+    router.get('/calldown', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        let platformName = null;
+        let success = false;
+        let statusCode = 200;
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        try {
+            const jwtToken = req.query.jwtToken;
+            if (!jwtToken) {
+                res.status(400).send('Please go to Settings and authorize CRM platform');
+                return;
+            }
+            const { items } = await calldown.list({ jwtToken, status: req.query.status });
+            success = true;
+            res.status(200).send({ successful: true, items });
+        } catch (e) {
+            console.log(`platform: ${platformName} \n${e.stack}`);
+            statusCode = e.response?.status ?? 'unknown';
+            res.status(400).send(e);
+            success = false;
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Get call down list',
+            interfaceName: 'getCallDownList',
+            adapterName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            extras: { statusCode },
+            eventAddedVia
+        });
+    });
+
+
+    router.delete('/calldown/:id', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        let platformName = null;
+        let success = false;
+        let statusCode = 200;
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        try {
+            const jwtToken = req.query.jwtToken;
+            const id = req.query.id;
+            if (!jwtToken) {
+                res.status(400).send('Please go to Settings and authorize CRM platform');
+                return;
+            }
+            const rid = req.params.id || id;
+            if (!rid) {
+                res.status(400).send('Missing id');
+                return;
+            }
+            await calldown.remove({ jwtToken, id: rid });
+            success = true;
+            res.status(200).send({ successful: true });
+        } catch (e) {
+            console.log(`platform: ${platformName} \n${e.stack}`);
+            statusCode = e.response?.status ?? 'unknown';
+            res.status(400).send(e);
+            success = false;
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Delete call down item',
+            interfaceName: 'deleteCallDownItem',
+            adapterName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            extras: { statusCode },
+            eventAddedVia
+        });
+    });
+
+
+    router.patch('/calldown/:id', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        let platformName = null;
+        let success = false;
+        let statusCode = 200;
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        try {
+            const jwtToken = req.query.jwtToken;
+            if (!jwtToken) {
+                res.status(400).send('Please go to Settings and authorize CRM platform');
+                return;
+            }
+            const id = req.params.id || req.body?.id;
+            if (!id) {
+                res.status(400).send('Missing id');
+                return;
+            }
+            await calldown.markCalled({ jwtToken, id, lastCallAt: req.body?.lastCallAt });
+            success = true;
+            res.status(200).send({ successful: true });
+        } catch (e) {
+            console.log(`platform: ${platformName} \n${e.stack}`);
+            statusCode = e.response?.status ?? 'unknown';
+            res.status(400).send(e);
+            success = false;
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Mark call down called',
+            interfaceName: 'markCallDownCalled',
+            adapterName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            extras: { statusCode },
+            eventAddedVia
+        });
+    });
+
     router.get('/custom/contact/search', async function (req, res) {
         const requestStartTime = new Date().getTime();
         let platformName = null;
@@ -1191,8 +1415,91 @@ function createCoreRouter() {
                 statusCode
             }
         });
+    });
+
+    router.get('/ringcentral/admin/report', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        let platformName = null;
+        let success = false;
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const jwtToken = req.query.jwtToken;
+        try {
+            if (jwtToken) {
+                const unAuthData = jwt.decodeJwt(jwtToken);
+                const user = await UserModel.findByPk(unAuthData?.id);
+                if (!user) {
+                    res.status(400).send('User not found');
+                    return;
+                }
+                const report = await adminCore.getAdminReport({ rcAccountId: user.rcAccountId, timezone: req.query.timezone, timeFrom: req.query.timeFrom, timeTo: req.query.timeTo });
+                res.status(200).send(report);
+                success = true;
+                return;
+            }
+            res.status(400).send('Invalid request');
+            success = false;
+        }
+        catch (e) {
+            console.log(`${e.stack}`);
+            res.status(400).send(e);
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Get admin report',
+            interfaceName: 'getAdminReport',
+            adapterName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            eventAddedVia
+        });
+    });
 
+    router.get('/ringcentral/admin/userReport', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        let platformName = null;
+        let success = false;
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const jwtToken = req.query.jwtToken;
+        try {
+            if (jwtToken) {
+                const unAuthData = jwt.decodeJwt(jwtToken);
+                const user = await UserModel.findByPk(unAuthData?.id);
+                if (!user) {
+                    res.status(400).send('User not found');
+                    return;
+                }
+                const report = await adminCore.getUserReport({ rcAccountId: user.rcAccountId, rcExtensionId: req.query.rcExtensionId, timezone: req.query.timezone, timeFrom: req.query.timeFrom, timeTo: req.query.timeTo });
+                res.status(200).send(report);
+                return;
+            }
+            res.status(400).send('Invalid request');
+            success = false;
+        }
+        catch (e) {
+            console.log(`${e.stack}`);
+            res.status(400).send(e);
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Get user report',
+            interfaceName: 'getUserReport',
+            adapterName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            eventAddedVia
+        });
     });
+
     if (process.env.IS_PROD === 'false') {
         router.post('/registerMockUser', async function (req, res) {
             const secretKey = req.query.secretKey;
@@ -1254,7 +1561,7 @@ function createCoreMiddleware() {
     return [
         bodyParser.json(),
         cors({
-            methods: ['GET', 'POST', 'PATCH', 'PUT']
+            methods: ['GET', 'POST', 'PATCH', 'PUT', 'DELETE']
         })
     ];
 }

package/lib/callLogComposer.js

@@ -61,10 +61,10 @@ async function composeCallLog(params) {
         body = upsertCallSessionId({ body, id: callLog.sessionId, logFormat });
     }
 
-    const ringcentralUsername = callLog.direction === 'Inbound' ? callLog?.to?.name : callLog?.from?.name;  
-    if (ringcentralUsername && (userSettings?.addRingCentralUserName?.value ?? false)) {
+    if (userSettings?.addRingCentralUserName?.value) {
+        const ringcentralUsername = (callLog.direction === 'Inbound' ? callLog?.to?.name : callLog?.from?.name) ?? '(pending...)';
         body = upsertRingCentralUserName({ body, userName: ringcentralUsername, logFormat });
-    }       
+    }
 
     const ringcentralNumber = callLog.direction === 'Inbound' ? callLog?.to?.phoneNumber : callLog?.from?.phoneNumber;
     if (ringcentralNumber && (userSettings?.addRingCentralNumber?.value ?? false)) {
@@ -115,6 +115,10 @@ async function composeCallLog(params) {
         body = upsertTranscript({ body, transcript, logFormat });
     }
 
+    if (callLog?.legs && (userSettings?.addCallLogLegs?.value ?? true)) {
+        body = upsertLegs({ body, legs: callLog.legs, logFormat });
+    }
+
     return body;
 }
 
@@ -184,22 +188,37 @@ function upsertRingCentralUserName({ body, userName, logFormat }) {
 
     if (logFormat === LOG_DETAILS_FORMAT_TYPE.HTML) {
         const userNameRegex = /(?:<li>)?<b>RingCentral user name<\/b>:\s*([^<\n]+)(?:<\/li>|(?=<|$))/i;
-        if (userNameRegex.test(body)) {
-            return body.replace(userNameRegex, `<li><b>RingCentral user name</b>: ${userName}</li>`);
+        const match = body.match(userNameRegex);
+        if (match) {
+            // Only replace if existing value is (pending...)
+            if (match[1].trim() === '(pending...)') {
+                return body.replace(userNameRegex, `<li><b>RingCentral user name</b>: ${userName}</li>`);
+            }
+            return body;
         } else {
             return body + `<li><b>RingCentral user name</b>: ${userName}</li>`;
         }
     } else if (logFormat === LOG_DETAILS_FORMAT_TYPE.MARKDOWN) {
-        const userNameRegex = /\*\*RingCentral user name\*\*: [^\n]*\n*/i;
-        if (userNameRegex.test(body)) {
-            return body.replace(userNameRegex, `**RingCentral user name**: ${userName}\n`);
+        const userNameRegex = /\*\*RingCentral user name\*\*: ([^\n]*)\n*/i;
+        const match = body.match(userNameRegex);
+        if (match) {
+            // Only replace if existing value is (pending...)
+            if (match[1].trim() === '(pending...)') {
+                return body.replace(userNameRegex, `**RingCentral user name**: ${userName}\n`);
+            }
+            return body;
         } else {
             return body + `**RingCentral user name**: ${userName}\n`;
         }
     } else {
-        const userNameRegex = /- RingCentral user name: [^\n]*\n*/;
-        if (userNameRegex.test(body)) {
-            return body.replace(userNameRegex, `- RingCentral user name: ${userName}\n`);
+        const userNameRegex = /- RingCentral user name: ([^\n]*)\n*/;
+        const match = body.match(userNameRegex);
+        if (match) {
+            // Only replace if existing value is (pending...)
+            if (match[1].trim() === '(pending...)') {
+                return body.replace(userNameRegex, `- RingCentral user name: ${userName}\n`);
+            }
+            return body;
         } else {
             return body + `- RingCentral user name: ${userName}\n`;
         }
@@ -327,9 +346,9 @@ function upsertCallDateTime({ body, startTime, timezoneOffset, logFormat, logDat
         }
     } else {
         // Handle duplicated Date/Time entries and match complete date/time values
-        const dateTimeRegex = /(?:- Date\/Time: [^-]*(?:-[^-]*)*)+/;
+        const dateTimeRegex = /^(- Date\/Time:).*$/m;
         if (dateTimeRegex.test(result)) {
-            result = result.replace(dateTimeRegex, `- Date/Time: ${formattedDateTime}\n`);
+            result = result.replace(dateTimeRegex, `- Date/Time: ${formattedDateTime}`);
         } else {
             result += `- Date/Time: ${formattedDateTime}\n`;
         }
@@ -521,6 +540,81 @@ function upsertTranscript({ body, transcript, logFormat }) {
     return result;
 }
 
+function getLegPartyInfo(info) {
+    let phoneNumber = info.phoneNumber;
+    let extensionNumber = info.extensionNumber;
+    let numberInfo = phoneNumber;
+    if (!phoneNumber && !extensionNumber) {
+        return '';
+    }
+    if (extensionNumber && phoneNumber) {
+        numberInfo = `${phoneNumber}, ext ${extensionNumber}`;
+    }
+    if (phoneNumber && !extensionNumber) {
+        numberInfo = phoneNumber;
+    }
+    if (!phoneNumber && extensionNumber) {
+        numberInfo = `ext ${extensionNumber}`;
+    }
+    if (info.name) {
+        return `${info.name}, ${numberInfo}`;
+    }
+    return numberInfo;
+}
+
+function getLegsJourney(legs) {
+    return legs.map((leg, index) => {
+        if (index === 0) {
+            if (leg.direction === 'Outbound') {
+                return `Made call from ${getLegPartyInfo(leg.from)}`;
+            } else {
+                return `Received call at ${getLegPartyInfo(leg.to)}`;
+            }
+        }
+        if (leg.direction === 'Outbound') {
+            let party = leg.from;
+            if (leg.legType === 'PstnToSip') {
+                party = leg.to;
+            }
+            return `Transferred to ${getLegPartyInfo(party)}, duration: ${leg.duration} second${leg.duration > 1 ? 's' : ''}`;
+        } else {
+            return `Transferred to ${getLegPartyInfo(leg.to)}, duration: ${leg.duration} second${leg.duration > 1 ? 's' : ''}`;
+        }
+    }).join('\n');
+}
+
+function upsertLegs({ body, legs, logFormat }) {
+    if (!legs || legs.length === 0) return body;
+
+    let result = body;
+    let legsJourney = getLegsJourney(legs);
+    if (logFormat === LOG_DETAILS_FORMAT_TYPE.HTML) {
+        legsJourney = legsJourney.replace(/(?:\r\n|\r|\n)/g, '<br>');
+        const legsRegex = /<div><b>Call journey<\/b><br>(.+?)<\/div>/;
+        if (legsRegex.test(result)) {
+            result = result.replace(legsRegex, `<div><b>Call journey</b><br>${legsJourney}</div>`);
+        } else {
+            result += `<div><b>Call journey</b><br>${legsJourney}</div>`;
+        }
+    } else if (logFormat === LOG_DETAILS_FORMAT_TYPE.MARKDOWN) {
+        const legsRegex = /### Call journey\n([\s\S]*?)(?=\n### |\n$|$)/;
+        if (legsRegex.test(result)) {
+            result = result.replace(legsRegex, `### Call journey\n${legsJourney}\n`);
+        } else {
+            result += `### Call journey\n${legsJourney}\n`;
+        }
+    } else {
+        const legsRegex = /- Call journey:([\s\S]*?)--- JOURNEY END/;
+        if (legsRegex.test(result)) {
+            result = result.replace(legsRegex, `- Call journey:\n${legsJourney}\n--- JOURNEY END`);
+        } else {
+            result += `- Call journey:\n${legsJourney}\n--- JOURNEY END\n`;
+        }
+    }
+
+    return result;
+}
+
 /**
  * Helper function to determine format type for a CRM platform
  * @param {string} platform - CRM platform name
@@ -547,5 +641,6 @@ module.exports = {
     upsertCallResult,
     upsertCallRecording,
     upsertAiNote,
-    upsertTranscript
-}; 
+    upsertTranscript,
+    upsertLegs,
+};