Merge pull request #3364 from RedisInsight/fe/bugfix/RI-5733

#RI-5733 - fix logout on switch account

Author: rsergeenko

redisinsight/ui/src/constants/api.ts

@@ -164,7 +164,6 @@ export const CLOUD_AUTH_API_ENDPOINTS = [
   ApiEndpoints.CLOUD_ME,
   ApiEndpoints.CLOUD_ME_JOBS,
   ApiEndpoints.CLOUD_ME_ACCOUNTS,
-  ApiEndpoints.CLOUD_CURRENT,
   ApiEndpoints.CLOUD_SUBSCRIPTION_PLANS,
   ApiEndpoints.CLOUD_ME_AUTODISCOVERY_ACCOUNT,
   ApiEndpoints.CLOUD_ME_AUTODISCOVERY_SUBSCRIPTIONS,

redisinsight/ui/src/slices/oauth/cloud.ts

@@ -3,7 +3,7 @@ import { AxiosError } from 'axios'
 import { remove } from 'lodash'
 import { apiService, localStorageService } from 'uiSrc/services'
 import { ApiEndpoints, BrowserStorageItem, Pages } from 'uiSrc/constants'
-import { getApiErrorMessage, getAxiosError, isStatusSuccessful, Nullable } from 'uiSrc/utils'
+import { getApiErrorCode, getApiErrorMessage, getAxiosError, isStatusSuccessful, Nullable } from 'uiSrc/utils'
 
 import { CloudJobName, CloudJobStatus } from 'uiSrc/electron/constants'
 import {
@@ -34,6 +34,7 @@ import {
   removeInfiniteNotification
 } from '../app/notifications'
 import { checkConnectToInstanceAction, setConnectedInstanceId } from '../instances/instances'
+import ApiStatusCode from '../../constants/apiStatusCode'
 
 export const initialState: StateAppOAuth = {
   loading: false,
@@ -415,6 +416,11 @@ export function activateAccount(
     } catch (error) {
       const err = getAxiosError(error as EnhancedAxiosError)
       const errorMessage = getApiErrorMessage(error as AxiosError)
+      const errorCode = getApiErrorCode(error as AxiosError)
+
+      if (errorCode === ApiStatusCode.Unauthorized) {
+        dispatch<any>(logoutUserAction())
+      }
 
       dispatch(addErrorNotification(err))
       dispatch(getUserInfoFailure(errorMessage))

redisinsight/ui/src/utils/apiResponse.ts

@@ -12,6 +12,8 @@ export const getAxiosError = (error: EnhancedAxiosError): AxiosError => {
   return error
 }
 
+export const getApiErrorCode = (error: AxiosError) => error?.response?.status
+
 export function getApiErrorMessage(error: AxiosError): string {
   const errorMessage = error?.response?.data?.message
   if (!error || !error.response) {

redisinsight/ui/src/utils/tests/apiResponse.spec.ts

@@ -1,13 +1,19 @@
 import { AxiosError } from 'axios'
-import { DEFAULT_ERROR_MESSAGE, getApiErrorMessage, getAxiosError, parseCloudOAuthError } from 'uiSrc/utils'
+import {
+  DEFAULT_ERROR_MESSAGE,
+  getApiErrorCode,
+  getApiErrorMessage,
+  getAxiosError,
+  parseCloudOAuthError
+} from 'uiSrc/utils'
 import { EnhancedAxiosError } from 'uiSrc/slices/interfaces'
 
 const error = { response: { data: { message: 'error' } } } as AxiosError
 const errors = { response: { data: { message: ['error1', 'error2'] } } } as AxiosError
 
-const customError1: EnhancedAxiosError = { response: { data: { message: 'error' } } }
-const customError2: EnhancedAxiosError = { response: { data: { message: 'error', errorCode: 11_002 } } }
-const customError3: EnhancedAxiosError = { response: { data: { message: 'error', error: 'UnexpectedError' } } }
+const customError1: EnhancedAxiosError = { response: { data: { message: 'error' }, status: 500 } }
+const customError2: EnhancedAxiosError = { response: { data: { message: 'error', errorCode: 11_002 }, status: 402 } }
+const customError3: EnhancedAxiosError = { response: { data: { message: 'error', error: 'UnexpectedError' }, status: 503 } }
 
 describe('getAxiosError', () => {
   it('should return proper error', () => {
@@ -24,3 +30,11 @@ describe('getApiErrorMessage', () => {
     expect(getApiErrorMessage(errors)).toEqual('error1')
   })
 })
+
+describe('getAxiosError', () => {
+  it('should return proper error code', () => {
+    expect(getApiErrorCode(customError1)).toEqual(500)
+    expect(getApiErrorCode(customError2)).toEqual(402)
+    expect(getApiErrorCode(customError3)).toEqual(503)
+  })
+})