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

package/handlers/user.js

@@ -20,7 +20,6 @@ async function getUserSettingsByAdmin({ rcAccessToken, rcAccountId }) {
     }
     const adminConfig = await AdminConfigModel.findByPk(hashedRcAccountId);
     return {
-        customManifestUrl: adminConfig?.customAdapter,
         userSettings: adminConfig?.userSettings
     };
 }

package/index.js

@@ -87,6 +87,7 @@ function createCoreRouter() {
         res.json(mergedReleaseNotes);
     });
 
+    // Obsolete
     router.get('/crmManifest', (req, res) => {
         try {
             const platformName = req.query.platformName || 'default';
@@ -235,6 +236,7 @@ function createCoreRouter() {
         });
     });
 
+    // Obsolete
     router.get('/serverVersionInfo', (req, res) => {
         const defaultCrmManifest = adapterRegistry.getManifest('default');
         res.send({ version: defaultCrmManifest?.version ?? 'unknown' });
@@ -1500,6 +1502,23 @@ function createCoreRouter() {
         });
     });
 
+    router.get('/ringcentral/oauth/callback', async function (req, res) {
+        const jwtToken = req.query.jwtToken;
+        if (jwtToken) {
+            const unAuthData = jwt.decodeJwt(jwtToken);
+            const { code } = req.query;
+            const user = await UserModel.findByPk(unAuthData?.id);
+            if (!user) {
+                res.status(400).send('User not found');
+                return;
+            }
+            await authCore.onRingcentralOAuthCallback({ code, rcAccountId: user.rcAccountId });
+            res.status(200).send('OK');
+            return;
+        }
+        res.status(400).send('Invalid request');
+    });
+
     if (process.env.IS_PROD === 'false') {
         router.post('/registerMockUser', async function (req, res) {
             const secretKey = req.query.secretKey;

package/lib/callLogComposer.js

@@ -621,9 +621,16 @@ function upsertLegs({ body, legs, logFormat }) {
  * @returns {string} Format type
  */
 function getLogFormatType(platform) {
-    const manifest = adapterRegistry.getManifest(platform, true);
-    const platformConfig = manifest.platforms?.[platform];
-    return platformConfig?.logFormat;
+    if(process.env.LOG_FORMAT_PLAIN_TEXT_PLATFORMS.split(',').includes(platform)){
+        return LOG_DETAILS_FORMAT_TYPE.PLAIN_TEXT;
+    }
+    if(process.env.LOG_FORMAT_HTML_PLATFORMS.split(',').includes(platform)){
+        return LOG_DETAILS_FORMAT_TYPE.HTML;
+    }
+    if(process.env.LOG_FORMAT_MARKDOWN_PLATFORMS.split(',').includes(platform)){
+        return LOG_DETAILS_FORMAT_TYPE.MARKDOWN;
+    }
+    return LOG_DETAILS_FORMAT_TYPE.PLAIN_TEXT;
 }
 
 module.exports = {

package/lib/oauth.js

@@ -33,7 +33,7 @@ async function checkAndRefreshAccessToken(oauthApp, user, tokenLockTimeout = 20)
     // Other CRMs - check if token will expire within the buffer time
     if (user && user.accessToken && user.refreshToken && tokenExpiry.isBefore(now.clone().add(expiryBuffer, 'minutes'))) {
         // case: use dynamoDB to manage token refresh lock
-        if (adapterRegistry.getManifest('default')?.platforms?.[user.platform]?.auth?.useTokenRefreshLock) {
+        if (process.env.USE_TOKEN_REFRESH_LOCK_PLATFORMS.split(',').includes(user.platform)) {
             let newLock;
             const { Lock } = require('../models/dynamo/lockSchema');
             // Try to atomically create lock only if it doesn't exist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@app-connect/core",
-  "version": "1.7.0-beta.1",
+  "version": "1.7.0-beta.3",
   "description": "RingCentral App Connect Core",
   "main": "index.js",
   "repository": {

package/releaseNotes.json

@@ -1,4 +1,28 @@
 {
+    "1.6.9": {
+        "global": [
+            {
+                "type": "New",
+                "description": "- Server-side logging now supports multiple RingCentral users to be mapped under one CRM user"
+            },
+            {
+                "type": "Fix",
+                "description": "- Server-side logging user mapping not working properly when running under multi-site scenarios"
+            }
+        ]
+    },
+    "1.6.8": {
+        "global": [
+            {
+                "type": "Fix",
+                "description": "- Server-side logging, if it's created by one admin, the other admin will be able to see its status"
+            },
+            {
+                "type": "Fix",
+                "description": "- Conference calls show wrong warning message"
+            }
+        ]
+    },
     "1.6.7": {
         "global": [
             {