@app-connect/core 1.7.33 → 1.7.35

package/handlers/auth.js

@@ -50,7 +50,7 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, hashedRcEx
     let overridingOAuthOption = null;
     if (platformModule.getOverridingOAuthOption != null) {
         const code = new URL(callbackUri).searchParams.get('code');
-        overridingOAuthOption = platformModule.getOverridingOAuthOption({ code });
+        overridingOAuthOption = platformModule.getOverridingOAuthOption({ code, oauthInfo });
     }
     const oauthApp = oauth.getOAuthApp(oauthInfo);
     const { accessToken, refreshToken, expires, data } = await oauthApp.code.getToken(callbackUri, overridingOAuthOption);

package/handlers/log.js

@@ -103,6 +103,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 +183,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}`,

package/index.js

@@ -118,13 +118,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 +135,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 +147,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 +1040,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', {});

package/package.json

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

package/releaseNotes.json

@@ -1,4 +1,52 @@
 {
+    "1.7.35": {
+        "global": [
+            {
+                "type": "New",
+                "description": "Can show RingCentral Account Id on support page"
+            },
+            {
+                "type": "New",
+                "description": "Add hashedExtensionId in plugin calls"
+            },
+            {
+                "type": "New",
+                "description": "Show notification when having incoming call while minized"
+            },
+            {
+                "type": "Fix",
+                "description": "User session refresh and validtion issue"
+            },
+            {
+                "type": "Fix",
+                "description": "Warm-transfer call pop"
+            },
+            {
+                "type": "Fix",
+                "description": "Refresh manifest for override properties"
+            }
+        ]
+    },
+    "1.7.34": {
+        "global": [
+            {
+                "type": "New",
+                "description": "Call pop fallback url when no matched contact"
+            },
+            {
+                "type": "Fix",
+                "description": "Hostname page input debounce"
+            },
+            {
+                "type": "Fix",
+                "description": "RingCentral additional info submission during auth"
+            },
+            {
+                "type": "Fix",
+                "description": "Managed auth, admins can now see hidden fields"
+            }
+        ]
+    },
     "1.7.33": {
         "global": [
             {

package/test/handlers/auth.test.js

@@ -863,8 +863,9 @@ describe('Auth Handler', () => {
     test('should use overriding OAuth option if provided', async () => {
       // Arrange
       const overridingOption = { redirect_uri: 'custom-redirect' };
+      const oauthInfo = { clientId: 'id', clientSecret: 'secret' };
       const mockConnector = global.testUtils.createMockConnector({
-        getOauthInfo: jest.fn().mockResolvedValue({ clientId: 'id', clientSecret: 'secret' }),
+        getOauthInfo: jest.fn().mockResolvedValue(oauthInfo),
         getOverridingOAuthOption: jest.fn().mockReturnValue(overridingOption),
         getUserInfo: jest.fn().mockResolvedValue({
           successful: true,
@@ -892,7 +893,10 @@ describe('Auth Handler', () => {
       await authHandler.onOAuthCallback(requestData);
 
       // Assert
-      expect(mockConnector.getOverridingOAuthOption).toHaveBeenCalledWith({ code: 'code123' });
+      expect(mockConnector.getOverridingOAuthOption).toHaveBeenCalledWith({
+        code: 'code123',
+        oauthInfo: { clientId: 'id', clientSecret: 'secret' }
+      });
       expect(mockOAuthApp.code.getToken).toHaveBeenCalledWith(
         expect.any(String),
         overridingOption

package/test/handlers/log.test.js

@@ -324,7 +324,7 @@ describe('Log Handler', () => {
       expect(result.successful).toBe(true);
       expect(axios.post).toHaveBeenCalledWith(
         'https://plugins.example.com/plugin/testPlugin',
-        { data: mockIncomingData, config: null },
+        { data: mockIncomingData, config: null, hashedExtensionId: null },
         {
           headers: {
             Authorization: 'Bearer plugin-jwt-token'
@@ -402,7 +402,8 @@ describe('Log Handler', () => {
           data: mockIncomingData,
           config: null,
           asyncTaskId: cache.id,
-          callbackUrl: `https://app.example.com/plugin/async-callback/${cache.id}`
+          callbackUrl: `https://app.example.com/plugin/async-callback/${cache.id}`,
+          hashedExtensionId: null
         });
         expect(pluginCall[2]).toEqual({
           headers: {

package/test/index.test.js

@@ -33,7 +33,7 @@ describe('Core Router JWT normalization', () => {
     jest.clearAllMocks();
   });
 
-  test('should accept query jwtToken without refreshing it', async () => {
+  test('should accept query jwtToken without exp without refreshing it', async () => {
     jwt.decodeJwt.mockReturnValue({ id: 'user-1', platform: 'testCRM' });
     authCore.authValidation.mockResolvedValue({
       successful: true,
@@ -54,6 +54,69 @@ describe('Core Router JWT normalization', () => {
     expect(jwt.generateJwt).not.toHaveBeenCalled();
   });
 
+  test('should refresh near-expiry query jwtToken and expose header', async () => {
+    const nowMs = 1700000000000;
+    const nowSeconds = Math.floor(nowMs / 1000);
+    const nowSpy = jest.spyOn(Date, 'now').mockReturnValue(nowMs);
+    jwt.decodeJwt.mockImplementation((token) => {
+      if (token === 'query-token') {
+        return { id: 'user-1', platform: 'testCRM', exp: nowSeconds + 60 };
+      }
+      if (token === 'new-token') {
+        return { id: 'user-1', platform: 'testCRM', exp: nowSeconds + (14 * 24 * 60 * 60) };
+      }
+      return null;
+    });
+    jwt.generateJwt.mockReturnValue('new-token');
+    authCore.authValidation.mockResolvedValue({
+      successful: true,
+      returnMessage: { message: 'ok' },
+      failReason: null,
+      status: 200,
+    });
+    const app = buildApp();
+
+    const response = await request(app)
+      .get('/authValidation?jwtToken=query-token')
+      .set('Origin', 'https://example.com');
+
+    expect(response.status).toBe(200);
+    expect(response.headers['x-refreshed-jwt-token']).toBe('new-token');
+    expect(response.headers['access-control-expose-headers']).toContain('x-refreshed-jwt-token');
+    expect(jwt.generateJwt).toHaveBeenCalledWith({ id: 'user-1', platform: 'testCRM' });
+    expect(authCore.authValidation).toHaveBeenCalledWith({
+      platform: 'testCRM',
+      userId: 'user-1',
+    });
+    expect(jwt.decodeJwt).toHaveBeenCalledWith('new-token');
+    nowSpy.mockRestore();
+  });
+
+  test('should not rotate long-lived query jwtToken', async () => {
+    const nowMs = 1700000000000;
+    const nowSeconds = Math.floor(nowMs / 1000);
+    const nowSpy = jest.spyOn(Date, 'now').mockReturnValue(nowMs);
+    jwt.decodeJwt.mockReturnValue({
+      id: 'user-1',
+      platform: 'testCRM',
+      exp: nowSeconds + (120 * 365 * 24 * 60 * 60),
+    });
+    authCore.authValidation.mockResolvedValue({
+      successful: true,
+      returnMessage: { message: 'ok' },
+      failReason: null,
+      status: 200,
+    });
+    const app = buildApp();
+
+    const response = await request(app).get('/authValidation?jwtToken=query-token');
+
+    expect(response.status).toBe(200);
+    expect(response.headers['x-refreshed-jwt-token']).toBeUndefined();
+    expect(jwt.generateJwt).not.toHaveBeenCalled();
+    nowSpy.mockRestore();
+  });
+
   test('should refresh near-expiry bearer token and expose header', async () => {
     const nowMs = 1700000000000;
     const nowSeconds = Math.floor(nowMs / 1000);