Merge pull request #3440 from RedisInsight/fe/bugfix/release/2.50.0

#RI-5798 - [Regression] 401 error from WS is not handled

Author: egor-zalenski

redisinsight/ui/src/components/global-subscriptions/CommonAppSubscription/CommonAppSubscription.spec.tsx

@@ -110,34 +110,4 @@ describe('CommonAppSubscription', () => {
 
     unmount()
   })
-
-  it('should logout if cloud:job:monitor return statusCode=401', () => {
-    const { unmount } = render(<CommonAppSubscription />)
-
-    const mockData: CloudJobInfo = {
-      id: '4d76ba0c-71d3-4c9c-ada5-a6e5f4102af5',
-      name: 'CREATE_FREE_SUBSCRIPTION_AND_DATABASE',
-      status: 'failed',
-      error: {
-        message: 'Authorization failed',
-        statusCode: 401,
-        error: 'CloudApiUnauthorized',
-        errorCode: 11001
-      },
-      step: 'subscription'
-    }
-
-    socket.on(CloudJobEvents.Monitor, (data: CloudJobInfo) => {
-      expect(data).toEqual(mockData)
-    })
-
-    socket.socketClient.emit(CloudJobEvents.Monitor, mockData)
-
-    const afterRenderActions = [
-      logoutUser(),
-    ]
-    expect(store.getActions()).toEqual([...afterRenderActions])
-
-    unmount()
-  })
 })

redisinsight/ui/src/components/global-subscriptions/CommonAppSubscription/CommonAppSubscription.tsx

@@ -55,12 +55,6 @@ const CommonAppSubscription = () => {
 
     socketRef.current.on(CloudJobEvents.Monitor, (data: CloudJobInfo) => {
       const jobName = data.name as unknown
-      const statusCode = get(data, 'error.statusCode')
-
-      if (statusCode === ApiStatusCode.Unauthorized) {
-        dispatch(logoutUser())
-        return
-      }
 
       if (
         jobName === CloudJobName.CreateFreeDatabase

redisinsight/ui/src/components/oauth/oauth-jobs/OAuthJobs.spec.tsx

@@ -3,7 +3,7 @@ import { cloneDeep } from 'lodash'
 import { useSelector } from 'react-redux'
 import { AxiosError } from 'axios'
 import { cleanup, clearStoreActions, mockedStore, render } from 'uiSrc/utils/test-utils'
-import { oauthCloudJobSelector, setJob, setSocialDialogState } from 'uiSrc/slices/oauth/cloud'
+import { logoutUser, oauthCloudJobSelector, setJob, setSocialDialogState } from 'uiSrc/slices/oauth/cloud'
 import { CloudJobStatus, CloudJobName, CloudJobStep } from 'uiSrc/electron/constants'
 import { addErrorNotification, addInfiniteNotification, removeInfiniteNotification } from 'uiSrc/slices/app/notifications'
 import { RootState } from 'uiSrc/slices/store'
@@ -203,4 +203,38 @@ describe('OAuthJobs', () => {
       clearStoreActions(expectedActions)
     )
   })
+
+  it('should call logoutUser when statusCode is 401', async () => {
+    const mockDatabaseId = '123'
+    const error = {
+      statusCode: 401,
+      errorCode: CustomErrorCodes.CloudSubscriptionAlreadyExistsFree,
+      resource: {
+        databaseId: mockDatabaseId
+      }
+    };
+    (oauthCloudJobSelector as jest.Mock).mockImplementation(() => ({
+      status: ''
+    }))
+
+    const { rerender } = render(<OAuthJobs />);
+
+    (oauthCloudJobSelector as jest.Mock).mockImplementation(() => ({
+      status: CloudJobStatus.Failed,
+      error,
+    }))
+
+    rerender(<OAuthJobs />)
+
+    const expectedActions = [
+      logoutUser(),
+      addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
+      setSSOFlow(),
+      setSocialDialogState(null),
+      removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
+    ]
+    expect(clearStoreActions(store.getActions())).toEqual(
+      clearStoreActions(expectedActions)
+    )
+  })
 })

redisinsight/ui/src/components/oauth/oauth-jobs/OAuthJobs.tsx

@@ -8,6 +8,7 @@ import { fetchInstancesAction } from 'uiSrc/slices/instances/instances'
 import {
   createFreeDbJob,
   createFreeDbSuccess,
+  logoutUser,
   oauthCloudJobSelector,
   oauthCloudSelector,
   setJob,
@@ -18,7 +19,7 @@ import { addErrorNotification, addInfiniteNotification, removeInfiniteNotificati
 import { parseCloudOAuthError } from 'uiSrc/utils'
 import { INFINITE_MESSAGES, InfiniteMessagesIds } from 'uiSrc/components/notifications/components'
 import { TelemetryEvent, sendEventTelemetry } from 'uiSrc/telemetry'
-import { BrowserStorageItem, CustomErrorCodes } from 'uiSrc/constants'
+import { ApiStatusCode, BrowserStorageItem, CustomErrorCodes } from 'uiSrc/constants'
 import { localStorageService } from 'uiSrc/services'
 import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 
@@ -49,10 +50,15 @@ const OAuthJobs = () => {
         break
 
       case CloudJobStatus.Failed:
-
         const errorCode = get(error, 'errorCode', 0) as CustomErrorCodes
         const subscriptionId = get(error, 'resource.subscriptionId', 0)
         const resources = get(error, 'resource', {}) as CloudImportDatabaseResources
+        const statusCode = get(error, 'statusCode', 0) as number
+
+        if (statusCode === ApiStatusCode.Unauthorized) {
+          dispatch(logoutUser())
+        }
+
         // eslint-disable-next-line sonarjs/no-nested-switch
         switch (errorCode) {
           case CustomErrorCodes.CloudDatabaseAlreadyExistsFree: