@app-connect/core 1.7.34 → 1.7.36

package/connector/mock.js

@@ -27,19 +27,21 @@ async function deleteUser() {
     return false;
 }
 
-async function getCallLog({ sessionIds, extensionNumber }) {
+async function getCallLog({ sessionIds, extensionNumber, hashedExtensionId }) {
     const sessionIdsArray = sessionIds.split(',');
     const extensionNumberValue = extensionNumber?.toString() ?? '';
+    const hashedExtensionIdValue = hashedExtensionId?.toString() ?? '';
     const callLogs = await CallLogModel.findAll({
         where: buildCallLogSessionWhere({
             sessionIds: sessionIdsArray,
             extensionNumber: extensionNumberValue,
+            hashedExtensionId: hashedExtensionIdValue,
         }),
-        order: [['extensionNumber', 'ASC']]
+        order: [['hashedExtensionId', 'ASC'], ['extensionNumber', 'ASC']]
     });
     const logs = [];
     for (const sId of sessionIdsArray) {
-        const callLog = findMatchingCallLog(callLogs, sId, extensionNumberValue);
+        const callLog = findMatchingCallLog(callLogs, sId, extensionNumberValue, hashedExtensionIdValue);
         if (!callLog) {
             logs.push({ sessionId: sId, matched: false });
         }
@@ -51,12 +53,14 @@ async function getCallLog({ sessionIds, extensionNumber }) {
     return logs;
 }
 
-async function createCallLog({ sessionId, extensionNumber }) {
+async function createCallLog({ sessionId, extensionNumber, hashedExtensionId }) {
     const extensionNumberValue = extensionNumber?.toString() ?? '';
+    const hashedExtensionIdValue = hashedExtensionId?.toString() ?? '';
     let callLog = await CallLogModel.findOne({
         where: buildCallLogSessionWhere({
             sessionId,
             extensionNumber: extensionNumberValue,
+            hashedExtensionId: hashedExtensionIdValue,
         })
     });
     if (!callLog) {
@@ -64,6 +68,7 @@ async function createCallLog({ sessionId, extensionNumber }) {
             id: shortid.generate(),
             sessionId,
             extensionNumber: extensionNumberValue,
+            hashedExtensionId: hashedExtensionIdValue,
             userId: 'mockUser'
         });
     }

package/connector/proxy/engine.js

@@ -109,8 +109,8 @@ async function performRequest({ config, opName, inputs, user, authHeader }) {
   return response;
 }
 
-function mapFindContactResponse({ config, response }) {
-  const map = config.operations?.findContact?.responseMapping;
+function mapFindContactResponse({ config, response, opName = 'findContact' }) {
+  const map = config.operations?.[opName]?.responseMapping;
   if (!map) return [];
   const __ctx = { body: response.data };
   const list = getByPath(__ctx, map.listPath || 'body') || [];
@@ -123,6 +123,7 @@ function mapFindContactResponse({ config, response }) {
       type: getByPath(it, itemMap.typePath || 'type') || 'Contact',
       title: getByPath(it, itemMap.titlePath || 'title') || "",
       company: getByPath(it, itemMap.companyPath || 'company') || "",
+      createdDate: getByPath(it, itemMap.createdDatePath || 'createdDate') || undefined,
       mostRecentActivityDate: getByPath(it, itemMap.mostRecentActivityDatePath || 'mostRecentActivityDate') || undefined,
       additionalInfo: getByPath(it, itemMap.additionalInfoPath || 'additionalInfo') || null
     };

package/connector/proxy/index.js

@@ -179,7 +179,7 @@ async function findContact({ user, authHeader, phoneNumber, overridingFormat, is
     user,
     authHeader
   });
-  const matchedContactInfo = mapFindContactResponse({ config: cfg, response });
+  const matchedContactInfo = mapFindContactResponse({ config: cfg, response, opName: 'findContact' });
   return {
     successful: true,
     matchedContactInfo,
@@ -225,7 +225,7 @@ async function findContactWithName({ user, authHeader, name, proxyConfig }) {
     user,
     authHeader
   });
-  const matchedContactInfo = mapFindContactResponse({ config: cfg, response });
+  const matchedContactInfo = mapFindContactResponse({ config: cfg, response, opName: 'findContactWithName' });
   return {
     successful: true,
     matchedContactInfo,

package/docs/architecture.md

@@ -26,6 +26,7 @@ Its job is to expose a stable HTTP surface, persist shared state, and delegate C
 - installs an axios interceptor in local-style environments
 - syncs Sequelize models on startup unless `DISABLE_SYNC_DB_TABLE` or `skipDatabaseInit` disables it
 - adds the `hashedRcExtensionId` column to `users` if an older schema is missing it
+- migrates `callLogs` to include `hashedExtensionId` in the local call-log identity key when an older schema is missing it
 - mounts all shared HTTP routes
 - exposes dev-only mock routes when `IS_PROD === 'false'`
 

package/docs/handlers.md

@@ -59,7 +59,7 @@ This is the heaviest handler in the package.
 
 Key responsibilities:
 
-- prevents duplicate call-log creation by checking `CallLogModel` on `sessionId`
+- prevents duplicate call-log creation by checking `CallLogModel` on `sessionId` plus extension identity (`hashedExtensionId` first, with legacy `extensionNumber` fallback)
 - loads note cache from DynamoDB when `USE_CACHE` and server-side call logging are enabled
 - runs configured synchronous plugins before creating or updating logs
 - dispatches configured asynchronous call plugins after call-log create or update succeeds

package/docs/models.md

@@ -35,6 +35,8 @@ Stores the mapping between telephony sessions and CRM call logs.
 | --- | --- |
 | `id` | Telephony call id |
 | `sessionId` | Session id; also part of the composite primary key |
+| `extensionNumber` | Legacy RingCentral extension number identity; part of the composite primary key |
+| `hashedExtensionId` | Hashed RingCentral extension id used for current call-log identity; part of the composite primary key |
 | `platform` | Connector platform |
 | `thirdPartyLogId` | CRM log id |
 | `userId` | App Connect user id |

package/docs/routes.md

@@ -75,7 +75,7 @@ This page documents the non-MCP HTTP routes defined in `index.js`.
 | Method | Path | Purpose |
 | --- | --- | --- |
 | `POST` | `/callLog/cacheNote` | Stores a temporary note for server-side call logging |
-| `GET` | `/callLog` | Looks up existing call logs by session id |
+| `GET` | `/callLog` | Looks up existing call logs by session id plus extension identity |
 | `POST` | `/callLog` | Creates a CRM call log and stores the local linkage record |
 | `PATCH` | `/callLog` | Updates an existing CRM call log |
 | `PUT` | `/callDisposition` | Upserts call disposition data through the connector |

package/handlers/disposition.js

@@ -6,12 +6,13 @@ const { Connector } = require('../models/dynamo/connectorSchema');
 const { handleApiError } = require('../lib/errorHandler');
 const { buildCallLogSessionWhere } = require('../lib/callLogLookup');
 
-async function upsertCallDisposition({ platform, userId, sessionId, extensionNumber, dispositions }) {
+async function upsertCallDisposition({ platform, userId, sessionId, extensionNumber, hashedExtensionId, dispositions }) {
     try {
         const existingCallLog = await CallLogModel.findOne({
             where: buildCallLogSessionWhere({
                 sessionId,
                 extensionNumber,
+                hashedExtensionId,
             })
         });
         if (!existingCallLog) {
@@ -75,7 +76,7 @@ async function upsertCallDisposition({ platform, userId, sessionId, extensionNum
         return { successful: !!logId, logId, returnMessage, extraDataTracking };
     }
     catch (e) {
-        return handleApiError(e, platform, 'upsertCallDisposition', { userId, sessionId, extensionNumber, dispositions });
+        return handleApiError(e, platform, 'upsertCallDisposition', { userId, sessionId, extensionNumber, hashedExtensionId, dispositions });
     }
 }
 

package/handlers/log.js

@@ -20,6 +20,7 @@ const { AccountDataModel } = require('../models/accountDataModel');
 const pluginCore = require('./plugin');
 const {
     getCallLogExtensionNumber,
+    getCallLogHashedExtensionId,
     buildCallLogSessionWhere,
     findMatchingCallLog,
 } = require('../lib/callLogLookup');
@@ -73,6 +74,7 @@ function buildAsyncPluginTaskData({ taskId, callbackUrl, pluginId, platform, ope
         rcAccountId: user.rcAccountId,
         sessionId: logInfo.sessionId ?? incomingData?.sessionId,
         extensionNumber: getCallLogExtensionNumber(incomingData),
+        hashedExtensionId: getCallLogHashedExtensionId(incomingData),
         callLogId: existingCallLog?.id ?? logInfo.telephonySessionId ?? logInfo.id,
         thirdPartyLogId: existingCallLog?.thirdPartyLogId,
         contactId: existingCallLog?.contactId ?? incomingData?.contactId,
@@ -103,6 +105,7 @@ async function runSyncCallPlugins({ syncCallPlugins, incomingData, user, platfor
         const processedResultResponse = await axios.post(pluginEndpointUrl, {
             data: processedIncomingData,
             config: userConfig,
+            hashedExtensionId: user.hashedRcExtensionId,
         }, {
             headers: {
                 Authorization: `Bearer ${pluginJwtToken}`,
@@ -182,6 +185,7 @@ async function dispatchAsyncCallPlugin({ plugin, incomingData, user, platform, o
             config: pluginCore.getPluginConfigFromUserSettings({ userSettings: user.userSettings, pluginId }),
             asyncTaskId: taskId,
             callbackUrl,
+            hashedExtensionId: user.hashedRcExtensionId,
         }, {
             headers: {
                 Authorization: `Bearer ${syncedPluginJwtToken ?? pluginJwtToken}`,
@@ -305,6 +309,7 @@ async function appendAsyncPluginNoteToCallLog({ taskCache, note }) {
         ...buildCallLogSessionWhere({
             sessionId: taskData.sessionId,
             extensionNumber: taskData.extensionNumber,
+            hashedExtensionId: taskData.hashedExtensionId,
         }),
         platform: taskData.platform,
         userId: taskData.userId,
@@ -446,12 +451,14 @@ async function handleAsyncPluginCallback({ taskId, body }) {
 async function createCallLog({ platform, userId, incomingData, hashedAccountId, isFromSSCL }) {
     try {
         const extensionNumber = getCallLogExtensionNumber(incomingData);
+        const hashedExtensionId = getCallLogHashedExtensionId(incomingData);
         let existingCallLog = null;
         try {
             existingCallLog = await CallLogModel.findOne({
                 where: buildCallLogSessionWhere({
                     sessionId: incomingData.logInfo.sessionId,
                     extensionNumber,
+                    hashedExtensionId,
                 })
             });
         }
@@ -610,6 +617,7 @@ async function createCallLog({ platform, userId, incomingData, hashedAccountId,
                     id: incomingData.logInfo.telephonySessionId || incomingData.logInfo.id,
                     sessionId: incomingData.logInfo.sessionId,
                     extensionNumber,
+                    hashedExtensionId,
                     platform,
                     thirdPartyLogId: logId,
                     userId,
@@ -649,7 +657,7 @@ async function createCallLog({ platform, userId, incomingData, hashedAccountId,
     }
 }
 
-async function getCallLog({ userId, sessionIds, extensionNumber, platform, requireDetails }) {
+async function getCallLog({ userId, sessionIds, extensionNumber, hashedExtensionId, platform, requireDetails }) {
     try {
         let user = await UserModel.findByPk(userId);
         if (!user || !user.accessToken) {
@@ -704,15 +712,16 @@ async function getCallLog({ userId, sessionIds, extensionNumber, platform, requi
                 where: buildCallLogSessionWhere({
                     sessionIds: sessionIdsArray,
                     extensionNumber,
+                    hashedExtensionId,
                 }),
-                order: [['extensionNumber', 'ASC']]
+                order: [['hashedExtensionId', 'ASC'], ['extensionNumber', 'ASC']]
             });
             for (const sId of sessionIdsArray) {
                 if (sId == 0) {
                     logs.push({ sessionId: sId, matched: false });
                     continue;
                 }
-                const callLog = findMatchingCallLog(callLogs, sId, extensionNumber);
+                const callLog = findMatchingCallLog(callLogs, sId, extensionNumber, hashedExtensionId);
                 if (!callLog) {
                     logs.push({ sessionId: sId, matched: false });
                 }
@@ -729,11 +738,12 @@ async function getCallLog({ userId, sessionIds, extensionNumber, platform, requi
                 where: buildCallLogSessionWhere({
                     sessionIds: sessionIdsArray,
                     extensionNumber,
+                    hashedExtensionId,
                 }),
-                order: [['extensionNumber', 'ASC']]
+                order: [['hashedExtensionId', 'ASC'], ['extensionNumber', 'ASC']]
             });
             for (const sId of sessionIdsArray) {
-                const callLog = findMatchingCallLog(callLogs, sId, extensionNumber);
+                const callLog = findMatchingCallLog(callLogs, sId, extensionNumber, hashedExtensionId);
                 if (!callLog) {
                     logs.push({ sessionId: sId, matched: false });
                 }
@@ -745,19 +755,21 @@ async function getCallLog({ userId, sessionIds, extensionNumber, platform, requi
         return { successful: true, logs, returnMessage, extraDataTracking };
     }
     catch (e) {
-        return handleApiError(e, platform, 'getCallLog', { userId, sessionIds, requireDetails, extensionNumber });
+        return handleApiError(e, platform, 'getCallLog', { userId, sessionIds, requireDetails, extensionNumber, hashedExtensionId });
     }
 }
 
 async function updateCallLog({ platform, userId, incomingData, hashedAccountId, isFromSSCL }) {
     try {
         const extensionNumber = getCallLogExtensionNumber(incomingData);
+        const hashedExtensionId = getCallLogHashedExtensionId(incomingData);
         let existingCallLog = null;
         try {
             existingCallLog = await CallLogModel.findOne({
                 where: buildCallLogSessionWhere({
                     sessionId: incomingData.sessionId,
                     extensionNumber,
+                    hashedExtensionId,
                 })
             });
         }

package/handlers/plugin.js

@@ -48,7 +48,14 @@ async function getPluginLicenseStatus({ rcAccountId, pluginId }) {
             'Authorization': `Bearer ${accountData.data.jwtToken}`
         }
     });
-    return licenseStatusResponse.data;
+    const licenseStatus = licenseStatusResponse.data;
+    if (!licenseStatus || !Object.prototype.hasOwnProperty.call(licenseStatus, 'licenseStatus')) {
+        return {
+            licenseStatus: false,
+            licenseStatusDescription: 'Plugin license status unavailable'
+        };
+    }
+    return licenseStatus;
 }
 
 function getRefreshedJwtTokenFromHeaders({ headers }) {
@@ -58,15 +65,15 @@ function getRefreshedJwtTokenFromHeaders({ headers }) {
     return headers['x-refreshed-jwt-token'] || headers['X-Refreshed-Jwt-Token'] || null;
 }
 
-async function resolvePluginManifest({ pluginId, pluginAccess, rcAccountId, pluginName }) {
+async function resolvePluginManifest({ pluginId, pluginAccess, ownerRcAccountId, pluginName }) {
     const manifestFetchers = [];
     if (pluginAccess === 'public') {
         manifestFetchers.push(`${PUBLIC_MANIFEST_BASE}/${pluginId}/manifest?type=plugin`);
     } else if (pluginAccess === 'private' || pluginAccess === 'shared') {
-        manifestFetchers.push(`${PUBLIC_MANIFEST_BASE}/${pluginId}/manifest?access=internal&type=plugin&accountId=${rcAccountId}`);
+        manifestFetchers.push(`${PUBLIC_MANIFEST_BASE}/${pluginId}/manifest?access=internal&type=plugin&accountId=${ownerRcAccountId}`);
     } else {
         manifestFetchers.push(`${PUBLIC_MANIFEST_BASE}/${pluginId}/manifest?type=plugin`);
-        manifestFetchers.push(`${PUBLIC_MANIFEST_BASE}/${pluginId}/manifest?access=internal&type=plugin&accountId=${rcAccountId}`);
+        manifestFetchers.push(`${PUBLIC_MANIFEST_BASE}/${pluginId}/manifest?access=internal&type=plugin&accountId=${ownerRcAccountId}`);
     }
 
     let pluginData = null;
@@ -132,8 +139,8 @@ async function persistPluginData({ rcAccountId, pluginId, jwtToken, pluginData =
     }
 }
 
-async function registerPluginAccount({ pluginId, rcAccessToken, rcAccountId, pluginAccess, pluginName }) {
-    const { pluginManifest } = await resolvePluginManifest({ pluginId, pluginAccess, rcAccountId, pluginName });
+async function registerPluginAccount({ pluginId, rcAccessToken, rcAccountId, pluginAccess, pluginName, ownerRcAccountId }) {
+    const { pluginManifest } = await resolvePluginManifest({ pluginId, pluginAccess, ownerRcAccountId, pluginName });
     if (!pluginManifest?.endpointUrl) {
         throw new Error(`Plugin endpoint URL not found for ${pluginId}`);
     }

package/index.js

@@ -33,6 +33,8 @@ const logger = require('./lib/logger');
 const { DebugTracer } = require('./lib/debugTracer');
 const s3ErrorLogReport = require('./lib/s3ErrorLogReport');
 const pluginCore = require('./handlers/plugin');
+const { sequelize } = require('./models/sequelize');
+const { ensureCallLogsHashedExtensionIdSchema } = require('./lib/migrateCallLogsSchema');
 const { handleDatabaseError } = require('./lib/errorHandler');
 const { updateAuthSession } = require('./lib/authSession');
 const managedAuthCore = require('./handlers/managedAuth');
@@ -71,6 +73,7 @@ async function initDB() {
         await UserModel.sync();
         await LlmSessionModel.sync();
         await CallLogModel.sync();
+        await ensureCallLogsHashedExtensionIdSchema(sequelize);
         await MessageLogModel.sync();
         await AdminConfigModel.sync();
         await CacheModel.sync();
@@ -118,13 +121,12 @@ function normalizeJwtFromRequest(req, res, next) {
     const originalBearerToken = getBearerTokenFromRequest(req);
     const queryToken = req.query?.jwtToken;
     let bearerToken = originalBearerToken;
+    const isQueryAuth = !originalBearerToken && !!queryToken;
 
     // Backward compatibility: promote query jwtToken to Authorization Bearer.
-    if (!bearerToken && queryToken) {
+    if (isQueryAuth) {
         req.headers.authorization = `Bearer ${queryToken}`;
         bearerToken = queryToken;
-        // Don't refresh JWT because old version cannot update its local token storage to support refreshed token.
-        return next();
     }
 
     const token = bearerToken;
@@ -136,7 +138,7 @@ function normalizeJwtFromRequest(req, res, next) {
     const decodedToken = jwt.decodeJwt(token);
     if (!decodedToken?.id) {
         req.invalidJwtToken = true;
-        if (req.query?.jwtToken) {
+        if (originalBearerToken && req.query?.jwtToken) {
             delete req.query.jwtToken;
         }
         return next();
@@ -148,16 +150,17 @@ function normalizeJwtFromRequest(req, res, next) {
     if (typeof decodedToken.exp === 'number') {
         const now = Math.floor(Date.now() / 1000);
         const timeLeft = decodedToken.exp - now;
-        const isBearerAuth = !!originalBearerToken;
         const shouldRefreshNearExpiry = timeLeft <= JWT_REFRESH_THRESHOLD_SECONDS;
-        // Rotate legacy 120y tokens only for Bearer auth clients (they can persist refreshed headers).
-        const shouldRefreshLegacyLongLivedBearer = isBearerAuth && timeLeft > JWT_LEGACY_LONG_LIVED_THRESHOLD_SECONDS;
-        if (shouldRefreshNearExpiry || shouldRefreshLegacyLongLivedBearer) {
+        if (shouldRefreshNearExpiry) {
             const refreshedToken = jwt.generateJwt({
                 id: decodedToken.id.toString(),
                 platform: decodedToken.platform
             });
             res.setHeader('x-refreshed-jwt-token', refreshedToken);
+            req.headers.authorization = `Bearer ${refreshedToken}`;
+            if (isQueryAuth && req.query?.jwtToken) {
+                req.query.jwtToken = refreshedToken;
+            }
             req.jwtToken = refreshedToken;
             req.jwtAuth = jwt.decodeJwt(refreshedToken) || decodedToken;
         }
@@ -1040,6 +1043,11 @@ function createCoreRouter() {
             if (jwtToken) {
                 const unAuthData = jwt.decodeJwt(jwtToken);
                 platformName = unAuthData?.platform ?? 'Unknown';
+                if (!unAuthData || !unAuthData?.id) {
+                    tracer?.trace('getUserSettings:noToken', {});
+                    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 user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getUserSettings:userNotFound', {});
@@ -2031,6 +2039,7 @@ function createCoreRouter() {
                     userId,
                     sessionIds: req.query.sessionIds,
                     extensionNumber: req.query.extensionNumber,
+                    hashedExtensionId: req.query.hashedExtensionId,
                     platform,
                     requireDetails: req.query.requireDetails === 'true'
                 });
@@ -2227,6 +2236,7 @@ function createCoreRouter() {
                     userId,
                     sessionId: req.body.sessionId,
                     extensionNumber: req.body.extensionNumber,
+                    hashedExtensionId: req.body.hashedExtensionId,
                     dispositions: req.body.dispositions,
                     additionalSubmission: req.body.additionalSubmission
                 });
@@ -2753,7 +2763,7 @@ function createCoreRouter() {
         let success = false;
         const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
         try {
-            const { pluginId, rcAccountId, pluginAccess, pluginName } = req.body || {};
+            const { pluginId, rcAccountId, pluginAccess, pluginName, ownerRcAccountId } = req.body || {};
             const rcAccessToken = req.query?.rcAccessToken;
             if (!pluginId || !rcAccountId) {
                 res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'pluginId and rcAccountId are required' }) : { successful: false, returnMessage: 'pluginId and rcAccountId are required' });
@@ -2777,6 +2787,7 @@ function createCoreRouter() {
                 pluginId,
                 rcAccessToken,
                 rcAccountId: rcAccountId?.toString(),
+                ownerRcAccountId: ownerRcAccountId?.toString(),
                 pluginAccess,
                 pluginName,
             });
@@ -2915,7 +2926,7 @@ function createCoreRouter() {
         router.get('/mockCallLog', async function (req, res) {
             const secretKey = req.query.secretKey;
             if (secretKey === process.env.APP_SERVER_SECRET_KEY) {
-                const callLogs = await mock.getCallLog({ sessionIds: req.query.sessionIds, extensionNumber: req.query.extensionNumber });
+                const callLogs = await mock.getCallLog({ sessionIds: req.query.sessionIds, extensionNumber: req.query.extensionNumber, hashedExtensionId: req.query.hashedExtensionId });
                 res.status(200).send(callLogs);
             }
             else {
@@ -2925,7 +2936,7 @@ function createCoreRouter() {
         router.post('/mockCallLog', async function (req, res) {
             const secretKey = req.query.secretKey;
             if (secretKey === process.env.APP_SERVER_SECRET_KEY) {
-                await mock.createCallLog({ sessionId: req.body.sessionId, extensionNumber: req.body.extensionNumber });
+                await mock.createCallLog({ sessionId: req.body.sessionId, extensionNumber: req.body.extensionNumber, hashedExtensionId: req.body.hashedExtensionId });
                 res.status(200).send('Mock call log created');
             }
             else {

package/lib/callLogLookup.js

@@ -1,10 +1,39 @@
 const Op = require('sequelize').Op;
+const { getHashValue } = require('./util');
+
+function stringOrEmpty(value) {
+    return value == null ? '' : value.toString();
+}
 
 function getCallLogExtensionNumber(incomingData) {
-    return (incomingData?.extensionNumber ?? incomingData?.logInfo?.extensionNumber)?.toString() ?? '';
+    return stringOrEmpty(incomingData?.extensionNumber ?? incomingData?.logInfo?.extensionNumber);
+}
+
+function getCallLogHashedExtensionId(incomingData, hashKey = process.env.HASH_KEY) {
+    const hashedExtensionId = incomingData?.hashedExtensionId ?? incomingData?.logInfo?.hashedExtensionId;
+    if (hashedExtensionId) {
+        return hashedExtensionId.toString();
+    }
+
+    const rcExtensionId = incomingData?.rcExtensionId ?? incomingData?.logInfo?.rcExtensionId;
+    if (rcExtensionId && hashKey) {
+        return getHashValue(rcExtensionId.toString(), hashKey);
+    }
+
+    return '';
+}
+
+function buildLegacyIdentityWhere(extensionNumberValue) {
+    return {
+        extensionNumber: extensionNumberValue,
+        [Op.or]: [
+            { hashedExtensionId: '' },
+            { hashedExtensionId: null },
+        ],
+    };
 }
 
-function buildCallLogSessionWhere({ sessionId, sessionIds, extensionNumber }) {
+function buildCallLogSessionWhere({ sessionId, sessionIds, extensionNumber, hashedExtensionId }) {
     const where = {};
     if (sessionIds) {
         where.sessionId = {
@@ -14,21 +43,65 @@ function buildCallLogSessionWhere({ sessionId, sessionIds, extensionNumber }) {
     else {
         where.sessionId = sessionId;
     }
-    const extensionNumberValue = extensionNumber?.toString() ?? '';
-    if (extensionNumberValue) {
+
+    const extensionNumberValue = stringOrEmpty(extensionNumber);
+    const hashedExtensionIdValue = stringOrEmpty(hashedExtensionId);
+
+    if (hashedExtensionIdValue) {
+        const identityWhere = [
+            { hashedExtensionId: hashedExtensionIdValue },
+        ];
+        if (extensionNumberValue) {
+            identityWhere.push(buildLegacyIdentityWhere(extensionNumberValue));
+        }
+        identityWhere.push(buildLegacyIdentityWhere(''));
+        where[Op.or] = identityWhere;
+    }
+    else if (extensionNumberValue) {
         where.extensionNumber = extensionNumberValue;
     }
     return where;
 }
 
-function findMatchingCallLog(callLogs, sessionId, extensionNumber) {
-    const extensionNumberValue = extensionNumber?.toString() ?? '';
-    return callLogs.find(callLog => (
-        callLog.sessionId === sessionId &&
-        (!extensionNumberValue || (callLog.extensionNumber?.toString() ?? '') === extensionNumberValue)
+function hasEmptyHashedExtensionId(callLog) {
+    return !stringOrEmpty(callLog.hashedExtensionId);
+}
+
+function findMatchingCallLog(callLogs, sessionId, extensionNumber, hashedExtensionId) {
+    const extensionNumberValue = stringOrEmpty(extensionNumber);
+    const hashedExtensionIdValue = stringOrEmpty(hashedExtensionId);
+    const sessionLogs = callLogs.filter(callLog => callLog.sessionId === sessionId);
+
+    if (hashedExtensionIdValue) {
+        const exactHashedLog = sessionLogs.find(callLog => (
+            stringOrEmpty(callLog.hashedExtensionId) === hashedExtensionIdValue
+        ));
+        if (exactHashedLog) {
+            return exactHashedLog;
+        }
+
+        if (extensionNumberValue) {
+            const legacyExtensionLog = sessionLogs.find(callLog => (
+                hasEmptyHashedExtensionId(callLog) &&
+                stringOrEmpty(callLog.extensionNumber) === extensionNumberValue
+            ));
+            if (legacyExtensionLog) {
+                return legacyExtensionLog;
+            }
+        }
+
+        return sessionLogs.find(callLog => (
+            hasEmptyHashedExtensionId(callLog) &&
+            !stringOrEmpty(callLog.extensionNumber)
+        ));
+    }
+
+    return sessionLogs.find(callLog => (
+        !extensionNumberValue || stringOrEmpty(callLog.extensionNumber) === extensionNumberValue
     ));
 }
 
 exports.getCallLogExtensionNumber = getCallLogExtensionNumber;
+exports.getCallLogHashedExtensionId = getCallLogHashedExtensionId;
 exports.buildCallLogSessionWhere = buildCallLogSessionWhere;
 exports.findMatchingCallLog = findMatchingCallLog;