@app-connect/core 1.7.27 → 1.7.30

package/handlers/auth.js

@@ -34,6 +34,8 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, hashedRcEx
     if (!oauthInfo) {
         oauthInfo = await platformModule.getOauthInfo({ tokenUrl, hostname, rcAccountId: query.rcAccountId, proxyId, proxyConfig, userEmail, isFromMCP });
     }
+    const resolvedHostname = oauthInfo?.hostname ?? hostname;
+    const resolvedTokenUrl = oauthInfo?.accessTokenUri ?? tokenUrl;
     if (oauthInfo.failMessage) {
         return {
             userInfo: null,
@@ -53,7 +55,7 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, hashedRcEx
     const oauthApp = oauth.getOAuthApp(oauthInfo);
     const { accessToken, refreshToken, expires, data } = 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, userEmail, data });
+    const { successful, platformUserInfo, returnMessage } = await platformModule.getUserInfo({ authHeader, tokenUrl: resolvedTokenUrl, apiUrl, hostname: resolvedHostname, platform, username, callbackUri, query, proxyId, proxyConfig, userEmail, data });
 
     if (successful) {
         let userInfo = null;
@@ -61,10 +63,10 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, hashedRcEx
             userInfo = await saveUserInfo({
                 platformUserInfo,
                 platform,
-                tokenUrl,
+                tokenUrl: resolvedTokenUrl,
                 apiUrl,
                 username,
-                hostname: platformUserInfo?.overridingHostname ? platformUserInfo.overridingHostname : hostname,
+                hostname: platformUserInfo?.overridingHostname ? platformUserInfo.overridingHostname : resolvedHostname,
                 accessToken,
                 refreshToken,
                 tokenExpiry: isNaN(expires) ? null : expires,

package/index.js

@@ -3,7 +3,6 @@ const cors = require('cors')
 const bodyParser = require('body-parser');
 require('body-parser-xml')(bodyParser);
 const dynamoose = require('dynamoose');
-const Sequelize = require('sequelize');
 const { DynamoDB } = require('@aws-sdk/client-dynamodb');
 const axios = require('axios');
 const { UserModel } = require('./models/userModel');
@@ -36,10 +35,6 @@ const s3ErrorLogReport = require('./lib/s3ErrorLogReport');
 const pluginCore = require('./handlers/plugin');
 const { handleDatabaseError } = require('./lib/errorHandler');
 const { updateAuthSession } = require('./lib/authSession');
-const {
-    migrateCallLogsExtensionNumberSqlite,
-    sqliteCallLogsPkIncludesExtension,
-} = require('./lib/migrateCallLogsSchema');
 const managedAuthCore = require('./handlers/managedAuth');
 const managedOAuthCore = require('./handlers/managedOAuth');
 

package/lib/cacheCleanup.js

@@ -1,21 +1,60 @@
 const { Op } = require('sequelize');
 const { CacheModel } = require('../models/cacheModel');
+const { AccountDataModel } = require('../models/accountDataModel');
 const logger = require('./logger');
 
+const ACCOUNT_CONTACT_DATA_KEY_PATTERN = 'contact-%';
+const ACCOUNT_CONTACT_DATA_RETENTION_MONTHS = 3;
+
 async function clearExpiredCache({ now = new Date() } = {}) {
-    const deletedCount = await CacheModel.destroy({
+    const cacheDeletedCount = await clearExpiredCacheRows({ now });
+    const accountContactDataDeletedCount = await clearExpiredAccountContactData({ now });
+    const deletedCount = cacheDeletedCount + accountContactDataDeletedCount;
+
+    logger.info('Expired cache cleanup completed', {
+        deletedCount,
+        cacheDeletedCount,
+        accountContactDataDeletedCount
+    });
+
+    return deletedCount;
+}
+
+function getAccountContactDataCutoffDate({ now, retentionMonths }) {
+    const cutoffDate = new Date(now.getTime());
+    cutoffDate.setMonth(cutoffDate.getMonth() - retentionMonths);
+    return cutoffDate;
+}
+
+async function clearExpiredCacheRows({ now }) {
+    return CacheModel.destroy({
         where: {
             expiry: {
                 [Op.lte]: now
             }
         }
     });
+}
 
-    logger.info('Expired cache cleanup completed', { deletedCount });
+async function clearExpiredAccountContactData({
+    now = new Date(),
+    retentionMonths = ACCOUNT_CONTACT_DATA_RETENTION_MONTHS
+} = {}) {
+    const cutoffDate = getAccountContactDataCutoffDate({ now, retentionMonths });
 
-    return deletedCount;
+    return AccountDataModel.destroy({
+        where: {
+            dataKey: {
+                [Op.like]: ACCOUNT_CONTACT_DATA_KEY_PATTERN
+            },
+            createdAt: {
+                [Op.lt]: cutoffDate
+            }
+        }
+    });
 }
 
 module.exports = {
+    clearExpiredAccountContactData,
     clearExpiredCache
 };

package/package.json

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

package/releaseNotes.json

@@ -1,4 +1,24 @@
 {
+    "1.7.30": {
+        "global": [
+            {
+                "type": "Fix",
+                "description": "Shared SMS for sites"
+            },
+            {
+                "type": "Fix",
+                "description": "Conditional rendering of contact association fields"
+            }
+        ]
+    },
+    "1.7.29": {
+        "global": [
+            {
+                "type": "New",
+                "description": "Conditional rendering of logging form fields by contact type"
+            }
+        ]
+    },
     "1.7.27": {
         "global": [
             {

package/test/lib/cacheCleanup.test.js

@@ -1,9 +1,11 @@
 const { CacheModel } = require('../../models/cacheModel');
-const { clearExpiredCache } = require('../../lib/cacheCleanup');
+const { AccountDataModel } = require('../../models/accountDataModel');
+const { clearExpiredAccountContactData, clearExpiredCache } = require('../../lib/cacheCleanup');
 
 describe('cacheCleanup', () => {
   beforeEach(async () => {
     await CacheModel.destroy({ where: {} });
+    await AccountDataModel.destroy({ where: {} });
   });
 
   test('deletes only cache records whose expiry has passed', async () => {
@@ -39,4 +41,87 @@ describe('cacheCleanup', () => {
     expect(await CacheModel.findByPk('active-cache')).not.toBeNull();
     expect(await CacheModel.findByPk('cache-without-expiry')).not.toBeNull();
   });
+
+  test('deletes only account contact data older than three months', async () => {
+    const now = new Date('2026-06-08T00:00:00.000Z');
+
+    await AccountDataModel.bulkCreate([
+      {
+        rcAccountId: 'account-1',
+        platformName: 'test-platform',
+        dataKey: 'contact-+1111111111',
+        data: [{ id: 'old-contact' }],
+        createdAt: new Date('2026-03-07T23:59:59.000Z'),
+        updatedAt: new Date('2026-03-07T23:59:59.000Z')
+      },
+      {
+        rcAccountId: 'account-1',
+        platformName: 'test-platform',
+        dataKey: 'contact-+2222222222',
+        data: [{ id: 'exact-cutoff-contact' }],
+        createdAt: new Date('2026-03-08T00:00:00.000Z'),
+        updatedAt: new Date('2026-03-08T00:00:00.000Z')
+      },
+      {
+        rcAccountId: 'account-1',
+        platformName: 'test-platform',
+        dataKey: 'contact-+3333333333',
+        data: [{ id: 'active-contact' }],
+        createdAt: new Date('2026-03-08T00:00:01.000Z'),
+        updatedAt: new Date('2026-03-08T00:00:01.000Z')
+      },
+      {
+        rcAccountId: 'account-1',
+        platformName: 'test-platform',
+        dataKey: 'pluginData',
+        data: { jwtToken: 'plugin-token' },
+        createdAt: new Date('2026-03-07T23:59:59.000Z'),
+        updatedAt: new Date('2026-03-07T23:59:59.000Z')
+      }
+    ]);
+
+    const deletedCount = await clearExpiredAccountContactData({ now });
+
+    expect(deletedCount).toBe(1);
+    expect(await AccountDataModel.findOne({
+      where: { rcAccountId: 'account-1', platformName: 'test-platform', dataKey: 'contact-+1111111111' }
+    })).toBeNull();
+    expect(await AccountDataModel.findOne({
+      where: { rcAccountId: 'account-1', platformName: 'test-platform', dataKey: 'contact-+2222222222' }
+    })).not.toBeNull();
+    expect(await AccountDataModel.findOne({
+      where: { rcAccountId: 'account-1', platformName: 'test-platform', dataKey: 'contact-+3333333333' }
+    })).not.toBeNull();
+    expect(await AccountDataModel.findOne({
+      where: { rcAccountId: 'account-1', platformName: 'test-platform', dataKey: 'pluginData' }
+    })).not.toBeNull();
+  });
+
+  test('clearExpiredCache includes expired account contact data cleanup', async () => {
+    const now = new Date('2026-06-08T00:00:00.000Z');
+
+    await CacheModel.create({
+      id: 'expired-cache',
+      userId: 'user-1',
+      cacheKey: 'auth-session',
+      status: 'expired',
+      expiry: new Date('2026-06-07T23:59:59.000Z')
+    });
+    await AccountDataModel.create({
+      rcAccountId: 'account-1',
+      platformName: 'test-platform',
+      dataKey: 'contact-+1111111111',
+      data: [{ id: 'old-contact' }],
+      createdAt: new Date('2026-03-07T23:59:59.000Z'),
+      updatedAt: new Date('2026-03-07T23:59:59.000Z')
+    });
+
+    const deletedCount = await clearExpiredCache({ now });
+
+    expect(deletedCount).toBe(2);
+    expect(await CacheModel.findByPk('expired-cache')).toBeNull();
+    expect(await AccountDataModel.findOne({
+      where: { rcAccountId: 'account-1', platformName: 'test-platform', dataKey: 'contact-+1111111111' }
+    })).toBeNull();
+  });
 });