@app-connect/core 1.7.24 → 1.7.26

package/handlers/disposition.js

@@ -1,80 +1,82 @@
-const { CallLogModel } = require('../models/callLogModel');
-const { UserModel } = require('../models/userModel');
-const oauth = require('../lib/oauth');
-const connectorRegistry = require('../connector/registry');
-const { Connector } = require('../models/dynamo/connectorSchema');
-const { handleApiError } = require('../lib/errorHandler');
-
-async function upsertCallDisposition({ platform, userId, sessionId, dispositions }) {
-    try {
-        const existingCallLog = await CallLogModel.findOne({
-            where: {
-                sessionId
-            }
-        });
-        if (!existingCallLog) {
-            return {
-                successful: false,
-                returnMessage: {
-                    message: `Cannot find log`,
-                    messageType: 'warning',
-                    ttl: 3000
-                }
-            }
-        }
-        let user = await UserModel.findByPk(userId);
-        if (!user) {
-            return {
-                successful: false,
-                returnMessage: {
-                    message: `Cannot find user`,
-                    messageType: 'warning',
-                    ttl: 3000
-                }
-            }
-        }
-        const proxyId = user.platformAdditionalInfo?.proxyId;
-        let proxyConfig = null;
-        if (proxyId) {
-            proxyConfig = await Connector.getProxyConfig(proxyId);
-        }
-        const platformModule = connectorRegistry.getConnector(platform);
-        const authType = await platformModule.getAuthType({ proxyId, proxyConfig });
-        let authHeader = '';
-        switch (authType) {
-            case 'oauth':
-                const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
-                user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
-                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':
-                const basicAuth = platformModule.getBasicAuth({ apiKey: user.accessToken });
-                authHeader = `Basic ${basicAuth}`;
-                break;
-        }
-        const { logId, returnMessage, extraDataTracking } = await platformModule.upsertCallDisposition({
-            user,
-            existingCallLog,
-            authHeader,
-            dispositions,
-            proxyConfig
-        });
-        return { successful: !!logId, logId, returnMessage, extraDataTracking };
-    }
-    catch (e) {
-        return handleApiError(e, platform, 'upsertCallDisposition', { userId, sessionId, dispositions });
-    }
-}
-
-exports.upsertCallDisposition = upsertCallDisposition;
+const { CallLogModel } = require('../models/callLogModel');
+const { UserModel } = require('../models/userModel');
+const oauth = require('../lib/oauth');
+const connectorRegistry = require('../connector/registry');
+const { Connector } = require('../models/dynamo/connectorSchema');
+const { handleApiError } = require('../lib/errorHandler');
+const { buildCallLogSessionWhere } = require('../lib/callLogLookup');
+
+async function upsertCallDisposition({ platform, userId, sessionId, extensionNumber, dispositions }) {
+    try {
+        const existingCallLog = await CallLogModel.findOne({
+            where: buildCallLogSessionWhere({
+                sessionId,
+                extensionNumber,
+            })
+        });
+        if (!existingCallLog) {
+            return {
+                successful: false,
+                returnMessage: {
+                    message: `Cannot find log`,
+                    messageType: 'warning',
+                    ttl: 3000
+                }
+            }
+        }
+        let user = await UserModel.findByPk(userId);
+        if (!user) {
+            return {
+                successful: false,
+                returnMessage: {
+                    message: `Cannot find user`,
+                    messageType: 'warning',
+                    ttl: 3000
+                }
+            }
+        }
+        const proxyId = user.platformAdditionalInfo?.proxyId;
+        let proxyConfig = null;
+        if (proxyId) {
+            proxyConfig = await Connector.getProxyConfig(proxyId);
+        }
+        const platformModule = connectorRegistry.getConnector(platform);
+        const authType = await platformModule.getAuthType({ proxyId, proxyConfig });
+        let authHeader = '';
+        switch (authType) {
+            case 'oauth':
+                const oauthApp = oauth.getOAuthApp((await platformModule.getOauthInfo({ tokenUrl: user?.platformAdditionalInfo?.tokenUrl, hostname: user?.hostname, proxyId, proxyConfig })));
+                user = await oauth.checkAndRefreshAccessToken(oauthApp, user);
+                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':
+                const basicAuth = platformModule.getBasicAuth({ apiKey: user.accessToken });
+                authHeader = `Basic ${basicAuth}`;
+                break;
+        }
+        const { logId, returnMessage, extraDataTracking } = await platformModule.upsertCallDisposition({
+            user,
+            existingCallLog,
+            authHeader,
+            dispositions,
+            proxyConfig
+        });
+        return { successful: !!logId, logId, returnMessage, extraDataTracking };
+    }
+    catch (e) {
+        return handleApiError(e, platform, 'upsertCallDisposition', { userId, sessionId, extensionNumber, dispositions });
+    }
+}
+
+exports.upsertCallDisposition = upsertCallDisposition;