Merge pull request #3781 from RedisInsight/fe/bugfix/RI-6076-sso-validation

fix wrong state to show validation error

Author: vlad-dargel

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

@@ -228,6 +228,7 @@ describe('OAuthJobs', () => {
 
     const expectedActions = [
       logoutUser(),
+      setSSOFlow(),
       addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
       setSSOFlow(),
       setSocialDialogState(null),

redisinsight/ui/src/components/oauth/oauth-social/OAuthSocial.tsx

@@ -180,6 +180,6 @@ describe('OAuthUserProfile', () => {
 
     fireEvent.click(screen.getByTestId('profile-logout'))
 
-    expect(store.getActions()).toEqual([logoutUser()])
+    expect(store.getActions()).toEqual([logoutUser(), setSSOFlow()])
   })
 })

redisinsight/ui/src/components/oauth/oauth-user-profile/OAuthUserProfile.spec.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useState } from 'react'
 import { useDispatch } from 'react-redux'
 import { signIn } from 'uiSrc/slices/oauth/cloud'
 import { OAuthSocialAction, OAuthStrategy } from 'uiSrc/slices/interfaces'
@@ -25,10 +25,6 @@ const OAuthForm = ({
 
   const [authStrategy, setAuthStrategy] = useState('')
 
-  useEffect(() => () => {
-    setAuthStrategy('')
-  }, [])
-
   const initOAuthProcess = (strategy: OAuthStrategy, action: string, data?: {}) => {
     dispatch(signIn())
     ipcAuth(strategy, action, data)

redisinsight/ui/src/components/oauth/shared/oauth-form/OAuthForm.tsx

@@ -5,6 +5,7 @@ import { ApiEndpoints } from 'uiSrc/constants'
 import { cleanup, mockedStore } from 'uiSrc/utils/test-utils'
 import { logoutUser } from 'uiSrc/slices/oauth/cloud'
 import { store } from 'uiSrc/slices/store'
+import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 
 describe('requestInterceptor', () => {
   it('should properly set db-index to headers', () => {
@@ -54,7 +55,7 @@ describe('cloudAuthInterceptor', () => {
     try {
       await cloudAuthInterceptor(response)
     } catch {
-      expect(mockedTestStore.getActions()).toEqual([logoutUser()])
+      expect(mockedTestStore.getActions()).toEqual([logoutUser(), setSSOFlow()])
     }
   })
 

redisinsight/ui/src/services/tests/apiService.spec.ts

@@ -12,6 +12,7 @@ import {
 } from 'uiSrc/components/notifications/components'
 import successMessages from 'uiSrc/components/notifications/success-messages'
 import { getCloudSsoUtmParams } from 'uiSrc/utils/oauth/cloudSsoUtm'
+import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 import { CloudUser } from 'apiSrc/modules/cloud/user/models'
 import { CloudJobInfo } from 'apiSrc/modules/cloud/job/models'
 import { CloudSubscriptionPlanResponse } from 'apiSrc/modules/cloud/subscription/dto'
@@ -543,6 +544,7 @@ export function logoutUserAction(
 ) {
   return async (dispatch: AppDispatch) => {
     dispatch(logoutUser())
+    dispatch(setSSOFlow())
 
     try {
       const { status } = await apiService.get(

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

@@ -13,6 +13,7 @@ import {
 import { INFINITE_MESSAGES, InfiniteMessagesIds } from 'uiSrc/components/notifications/components'
 import { CloudJobStatus, CloudJobName } from 'uiSrc/electron/constants'
 import successMessages from 'uiSrc/components/notifications/success-messages'
+import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
 import reducer, {
   initialState,
   oauthCloudSelector,
@@ -1276,6 +1277,7 @@ describe('oauth cloud slice', () => {
         // Assert
         const expectedActions = [
           logoutUser(),
+          setSSOFlow(),
           logoutUserSuccess(),
         ]
         expect(store.getActions()).toEqual(expectedActions)
@@ -1298,6 +1300,7 @@ describe('oauth cloud slice', () => {
         // Assert
         const expectedActions = [
           logoutUser(),
+          setSSOFlow(),
           addErrorNotification(responsePayload as AxiosError),
           logoutUserFailure(),
         ]