#RI-5776 - fix sso flow

Author: rsergeenko

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 } from 'uiSrc/slices/oauth/cloud'
+import { 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'
@@ -132,6 +132,7 @@ describe('OAuthJobs', () => {
     const expectedActions = [
       addErrorNotification({ response: { data: error } } as AxiosError),
       setSSOFlow(),
+      setSocialDialogState(null),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(
@@ -163,6 +164,7 @@ describe('OAuthJobs', () => {
     const expectedActions = [
       addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
       setSSOFlow(),
+      setSocialDialogState(null),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(
@@ -194,6 +196,7 @@ describe('OAuthJobs', () => {
     const expectedActions = [
       addInfiniteNotification(INFINITE_MESSAGES.DATABASE_EXISTS()),
       setSSOFlow(),
+      setSocialDialogState(null),
       removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress),
     ]
     expect(clearStoreActions(store.getActions())).toEqual(

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

@@ -5,7 +5,14 @@ import { get } from 'lodash'
 
 import { CloudJobStatus, CloudJobName, CloudJobStep } from 'uiSrc/electron/constants'
 import { fetchInstancesAction } from 'uiSrc/slices/instances/instances'
-import { createFreeDbJob, createFreeDbSuccess, oauthCloudJobSelector, oauthCloudSelector, setJob } from 'uiSrc/slices/oauth/cloud'
+import {
+  createFreeDbJob,
+  createFreeDbSuccess,
+  oauthCloudJobSelector,
+  oauthCloudSelector,
+  setJob,
+  setSocialDialogState
+} from 'uiSrc/slices/oauth/cloud'
 import { CloudImportDatabaseResources } from 'uiSrc/slices/interfaces/cloud'
 import { addErrorNotification, addInfiniteNotification, removeInfiniteNotification } from 'uiSrc/slices/app/notifications'
 import { parseCloudOAuthError } from 'uiSrc/utils'
@@ -72,6 +79,7 @@ const OAuthJobs = () => {
         }
 
         dispatch(setSSOFlow())
+        dispatch(setSocialDialogState(null))
         dispatch(removeInfiniteNotification(InfiniteMessagesIds.oAuthProgress))
         break