Skip to content

Commit e4a5912

Browse files
fix wrong state to show validation error
1 parent 43baecf commit e4a5912

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

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

Whitespace-only changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,6 @@ describe('OAuthUserProfile', () => {
180180

181181
fireEvent.click(screen.getByTestId('profile-logout'))
182182

183-
expect(store.getActions()).toEqual([logoutUser()])
183+
expect(store.getActions()).toEqual([logoutUser(), setSSOFlow()])
184184
})
185185
})

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from 'react'
1+
import React, { useState } from 'react'
22
import { useDispatch } from 'react-redux'
33
import { signIn } from 'uiSrc/slices/oauth/cloud'
44
import { OAuthSocialAction, OAuthStrategy } from 'uiSrc/slices/interfaces'
@@ -25,10 +25,6 @@ const OAuthForm = ({
2525

2626
const [authStrategy, setAuthStrategy] = useState('')
2727

28-
useEffect(() => () => {
29-
setAuthStrategy('')
30-
}, [])
31-
3228
const initOAuthProcess = (strategy: OAuthStrategy, action: string, data?: {}) => {
3329
dispatch(signIn())
3430
ipcAuth(strategy, action, data)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
} from 'uiSrc/components/notifications/components'
1313
import successMessages from 'uiSrc/components/notifications/success-messages'
1414
import { getCloudSsoUtmParams } from 'uiSrc/utils/oauth/cloudSsoUtm'
15+
import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
1516
import { CloudUser } from 'apiSrc/modules/cloud/user/models'
1617
import { CloudJobInfo } from 'apiSrc/modules/cloud/job/models'
1718
import { CloudSubscriptionPlanResponse } from 'apiSrc/modules/cloud/subscription/dto'
@@ -543,6 +544,7 @@ export function logoutUserAction(
543544
) {
544545
return async (dispatch: AppDispatch) => {
545546
dispatch(logoutUser())
547+
dispatch(setSSOFlow())
546548

547549
try {
548550
const { status } = await apiService.get(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
import { INFINITE_MESSAGES, InfiniteMessagesIds } from 'uiSrc/components/notifications/components'
1414
import { CloudJobStatus, CloudJobName } from 'uiSrc/electron/constants'
1515
import successMessages from 'uiSrc/components/notifications/success-messages'
16+
import { setSSOFlow } from 'uiSrc/slices/instances/cloud'
1617
import reducer, {
1718
initialState,
1819
oauthCloudSelector,
@@ -1276,6 +1277,7 @@ describe('oauth cloud slice', () => {
12761277
// Assert
12771278
const expectedActions = [
12781279
logoutUser(),
1280+
setSSOFlow(),
12791281
logoutUserSuccess(),
12801282
]
12811283
expect(store.getActions()).toEqual(expectedActions)
@@ -1298,6 +1300,7 @@ describe('oauth cloud slice', () => {
12981300
// Assert
12991301
const expectedActions = [
13001302
logoutUser(),
1303+
setSSOFlow(),
13011304
addErrorNotification(responsePayload as AxiosError),
13021305
logoutUserFailure(),
13031306
]

0 commit comments

Comments
 (0)