#RI-5719 - handle double callback

#RI-5757 - add utm to cloud/me

Author: rsergeenko

redisinsight/ui/src/electron/components/ConfigOAuth/ConfigOAuth.tsx

@@ -26,7 +26,7 @@ const ConfigOAuth = () => {
 
   const ssoFlowRef = useRef(ssoFlow)
   const isRecommendedSettingsRef = useRef(isRecommendedSettings)
-  const isFlowStarted = useRef(!!ssoFlow)
+  const isFlowInProgress = useRef(false)
 
   const history = useHistory()
   const dispatch = useDispatch()
@@ -37,7 +37,10 @@ const ConfigOAuth = () => {
 
   useEffect(() => {
     ssoFlowRef.current = ssoFlow
-    isFlowStarted.current = !!ssoFlow
+
+    if (!ssoFlow) {
+      isFlowInProgress.current = false
+    }
   }, [ssoFlow])
 
   useEffect(() => {
@@ -91,18 +94,23 @@ const ConfigOAuth = () => {
   }
 
   const cloudOauthCallback = (_e: any, { status, message = '', error }: CloudAuthResponse) => {
-    if (!isFlowStarted.current) return
-
     if (status === CloudAuthStatus.Succeed) {
       dispatch(setJob({ id: '', name: CloudJobName.CreateFreeSubscriptionAndDatabase, status: '' }))
       localStorageService.remove(BrowserStorageItem.OAuthJobId)
       dispatch(showOAuthProgress(true))
       dispatch(addInfiniteNotification(INFINITE_MESSAGES.AUTHENTICATING()))
       dispatch(setSocialDialogState(null))
       dispatch(fetchUserInfo(fetchUserInfoSuccess, closeInfinityNotification))
+      isFlowInProgress.current = true
     }
 
     if (status === CloudAuthStatus.Failed) {
+      // don't do anything, because we are processing something
+      // covers situation when were made several clicks on the same time
+      if (isFlowInProgress.current) {
+        return
+      }
+
       const err = parseCloudOAuthError((error as CustomError) || message || '')
       dispatch(setOAuthCloudSource(null))
       dispatch(signInFailure(err?.response?.data?.message || message))

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

@@ -109,7 +109,8 @@ export enum CloudSsoUtmCampaign {
   Tutorial = 'tutorial',
   TriggersAndFunctions = 'redisinsight_triggers_and_functions',
   AutoDiscovery = 'auto_discovery',
-  Copilot = 'ai_chat',
-  UserProfile = 'account',
+  Copilot = 'copilot',
+  UserProfile = 'user_account',
+  Settings = 'settings',
   Unknown = 'other',
 }

redisinsight/ui/src/utils/oauth/cloudSsoUtm.tsx

@@ -31,6 +31,8 @@ export const getCloudSsoUtmCampaign = (source?: string | null): CloudSsoUtmCampa
       return CloudSsoUtmCampaign.Copilot
     case OAuthSocialSource.UserProfile:
       return CloudSsoUtmCampaign.UserProfile
+    case OAuthSocialSource.SettingsPage:
+      return CloudSsoUtmCampaign.Settings
     default:
       return CloudSsoUtmCampaign.Unknown
   }