@app-connect/core 1.7.8 → 1.7.10

package/handlers/auth.js

@@ -6,13 +6,18 @@ const { RingCentral } = require('../lib/ringcentral');
 const adminCore = require('./admin');
 const { Connector } = require('../models/dynamo/connectorSchema');
 
-async function onOAuthCallback({ platform, hostname, tokenUrl, callbackUri, apiUrl, username, query, proxyId }) {
+async function onOAuthCallback({ platform, hostname, tokenUrl, query }) {
+    const callbackUri = query.callbackUri;
+    const apiUrl = query.apiUrl;
+    const username = query.username;
+    const proxyId = query.proxyId;
+    const userEmail = query.userEmail;
     const platformModule = connectorRegistry.getConnector(platform);
     let proxyConfig = null;
     if (proxyId) {
         proxyConfig = await Connector.getProxyConfig(proxyId);
     }
-    const oauthInfo = await platformModule.getOauthInfo({ tokenUrl, hostname, rcAccountId: query.rcAccountId, proxyId, proxyConfig });
+    const oauthInfo = await platformModule.getOauthInfo({ tokenUrl, hostname, rcAccountId: query.rcAccountId, proxyId, proxyConfig, userEmail });
 
     if (oauthInfo.failMessage) {
         return {
@@ -27,12 +32,13 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, callbackUri, apiU
     // Some platforms require different oauth queries, this won't affect normal OAuth process unless CRM module implements getOverridingOAuthOption() method
     let overridingOAuthOption = null;
     if (platformModule.getOverridingOAuthOption != null) {
-        overridingOAuthOption = platformModule.getOverridingOAuthOption({ code: callbackUri.split('code=')[1] });
+        const code = new URL(callbackUri).searchParams.get('code');
+        overridingOAuthOption = platformModule.getOverridingOAuthOption({ code });
     }
     const oauthApp = oauth.getOAuthApp(oauthInfo);
     const { accessToken, refreshToken, expires } = 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 });
+    const { successful, platformUserInfo, returnMessage } = await platformModule.getUserInfo({ authHeader, tokenUrl, apiUrl, hostname, platform, username, callbackUri, query, proxyId, proxyConfig, userEmail });
 
     if (successful) {
         let userInfo = await saveUserInfo({

package/handlers/contact.js

@@ -4,10 +4,10 @@ const errorMessage = require('../lib/generalErrorMessage');
 const connectorRegistry = require('../connector/registry');
 const { Connector } = require('../models/dynamo/connectorSchema');
 const { DebugTracer } = require('../lib/debugTracer');
+const { AccountDataModel } = require('../models/accountDataModel');
 
-async function findContact({ platform, userId, phoneNumber, overridingFormat, isExtension, tracer }) {
+async function findContact({ platform, userId, phoneNumber, overridingFormat, isExtension, tracer, isForceRefreshAccountData = false }) {
     tracer?.trace('handler.findContact:entered', { platform, userId, phoneNumber });
-    
     try {
         let user = await UserModel.findOne({
             where: {
@@ -16,7 +16,7 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
             }
         });
         tracer?.trace('handler.findContact:userFound', { user });
-        
+
         if (!user || !user.accessToken) {
             tracer?.trace('handler.findContact:noUser', { userId });
             return {
@@ -28,6 +28,20 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
                 }
             };
         }
+        // find cached contact by composite key; findByPk expects raw PK values, so use where clause
+        const existingMatchedContactInfo = await AccountDataModel.findOne({
+            where: {
+                rcAccountId: user.rcAccountId,
+                platformName: platform,
+                dataKey: `contact-${phoneNumber}`
+            }
+        })
+        if (!isForceRefreshAccountData) {
+            if (existingMatchedContactInfo) {
+                console.log('found existing matched contact info in account data');
+                return { successful: true, returnMessage: null, contact: existingMatchedContactInfo.data, extraDataTracking: null };
+            }
+        }
         const proxyId = user.platformAdditionalInfo?.proxyId;
         let proxyConfig = null;
         if (proxyId) {
@@ -37,7 +51,7 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
         const platformModule = connectorRegistry.getConnector(platform);
         const authType = await platformModule.getAuthType({ proxyId, proxyConfig });
         tracer?.trace('handler.findContact:authType', { authType });
-        
+
         let authHeader = '';
         switch (authType) {
             case 'oauth':
@@ -52,12 +66,31 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
                 tracer?.trace('handler.findContact:apiKeyAuth', {});
                 break;
         }
-        
-        const { successful, matchedContactInfo, returnMessage, extraDataTracking } = await platformModule.findContact({ user, authHeader, phoneNumber, overridingFormat, isExtension, proxyConfig, tracer });
+
+        const { successful, matchedContactInfo, returnMessage, extraDataTracking } = await platformModule.findContact({ user, authHeader, phoneNumber, overridingFormat, isExtension, proxyConfig, tracer, isForceRefreshAccountData });
         tracer?.trace('handler.findContact:platformFindResult', { successful, matchedContactInfo });
-        
+
         if (matchedContactInfo != null && matchedContactInfo?.filter(c => !c.isNewContact)?.length > 0) {
             tracer?.trace('handler.findContact:contactsFound', { count: matchedContactInfo.length });
+            // save in org data
+            // Danger: it does NOT support one RC account mapping to multiple CRM platforms, because contacts will be shared
+            if (user.rcAccountId) {
+                if(existingMatchedContactInfo)
+                {
+                    await existingMatchedContactInfo.update({
+                        data: matchedContactInfo
+                    });
+                }
+                else{
+                    await AccountDataModel.create({
+                        rcAccountId: user.rcAccountId,
+                        platformName: platform,
+                        dataKey: `contact-${phoneNumber}`,
+                        data: matchedContactInfo
+                    });
+                }
+                console.log('store new matched contact info in account data');
+            }
             return { successful, returnMessage, contact: matchedContactInfo, extraDataTracking };
         }
         else {
@@ -95,7 +128,7 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
     } catch (e) {
         console.error(`platform: ${platform} \n${e.stack} \n${JSON.stringify(e.response?.data)}`);
         tracer?.traceError('handler.findContact:error', e, { platform, statusCode: e.response?.status });
-        
+
         if (e.response?.status === 429) {
             return {
                 successful: false,
@@ -179,7 +212,7 @@ async function createContact({ platform, userId, phoneNumber, newContactName, ne
             return { successful: false, returnMessage };
         }
     } catch (e) {
-        console.log(`platform: ${platform} \n${e.stack}`);
+        console.error(`platform: ${platform} \n${e.stack}`);
         if (e.response?.status === 429) {
             return {
                 successful: false,

package/handlers/log.js

@@ -194,7 +194,7 @@ async function getCallLog({ userId, sessionIds, platform, requireDetails }) {
         }
         let logs = [];
         let returnMessage = null;
-        let extraDataTracking = {};;
+        let extraDataTracking = {};
 
         // Handle undefined or null sessionIds
         if (!sessionIds) {
@@ -303,7 +303,7 @@ async function getCallLog({ userId, sessionIds, platform, requireDetails }) {
                             {
                                 id: '1',
                                 type: 'text',
-                                text: `Please check if your account has permission to CREATE logs.`
+                                text: `Please check if your account has permission to READ logs.`
                             }
                         ]
                     }
@@ -483,7 +483,7 @@ async function updateCallLog({ platform, userId, incomingData, hashedAccountId,
 async function createMessageLog({ platform, userId, incomingData }) {
     try {
         let returnMessage = null;
-        let extraDataTracking = {};;
+        let extraDataTracking = {};
         if (incomingData.logInfo.messages.length === 0) {
             return {
                 successful: false,
@@ -625,7 +625,7 @@ async function createMessageLog({ platform, userId, incomingData }) {
         return { successful: true, logIds, returnMessage, extraDataTracking };
     }
     catch (e) {
-        console.log(`platform: ${platform} \n${e.stack}`);
+        console.error(`platform: ${platform} \n${e.stack}`);
         if (e.response?.status === 429) {
             return {
                 successful: false,