moves relogin logic to upper level

Author: sergeyteleshev

webapp/packages/plugin-authentication/src/Dialog/useAuthDialogState.ts

@@ -15,6 +15,7 @@ import {
   type AuthProviderConfiguration,
   AuthProvidersResource,
   type IAuthCredentials,
+  type ILoginOptions,
 } from '@cloudbeaver/core-authentication';
 import { ConfirmationDialog, useObservableRef, useResource } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
@@ -201,7 +202,6 @@ export function useAuthDialogState(accessRequest: boolean, providerId: string |
       async login(linkUser: boolean, provider?: AuthProvider, configuration?: AuthProviderConfiguration): Promise<void> {
         provider = (provider || state.activeProvider) ?? undefined;
         configuration = (configuration || state.activeConfiguration) ?? undefined;
-        const isFederatedLogin = !!provider?.federated && !!configuration;
 
         if (!provider || this.authenticating) {
           return;
@@ -224,10 +224,10 @@ export function useAuthDialogState(accessRequest: boolean, providerId: string |
         try {
           this.state.setActiveProvider(provider, configuration ?? null);
 
-          if (isFederatedLogin) {
-            await this.federatedLogin(provider, configuration!);
+          if (provider.federated && configuration) {
+            await this.federatedLogin(provider, configuration);
           } else {
-            await authInfoService.login(provider.id, {
+            const options: ILoginOptions = {
               configurationId: configuration?.id,
               credentials: {
                 ...state.credentials,
@@ -239,35 +239,28 @@ export function useAuthDialogState(accessRequest: boolean, providerId: string |
               },
               forceSessionsLogout: state.forceSessionsLogout,
               linkUser,
-            });
+            };
+
+            try {
+              await authInfoService.login(provider.id, options);
+            } catch (exception: any) {
+              const gqlError = errorOf(exception, GQLError);
+
+              if (gqlError?.errorCode === EServerErrorCode.invalidCredentials) {
+                await authInfoService.login(provider.id, {
+                  ...options,
+                  hasOldHash: true,
+                });
+              }
+            }
           }
         } catch (exception: any) {
           const gqlError = errorOf(exception, GQLError);
-          const shouldReloginWithOldHash = !isFederatedLogin && gqlError?.errorCode === EServerErrorCode.invalidCredentials;
 
           if (gqlError?.errorCode === EServerErrorCode.tooManySessions) {
             state.isTooManySessions = true;
           }
 
-          if (shouldReloginWithOldHash) {
-            try {
-              await authInfoService.login(provider.id, {
-                configurationId: configuration?.id,
-                credentials: {
-                  ...state.credentials,
-                  credentials: {
-                    ...state.credentials.credentials,
-                    user: state.credentials.credentials['user']?.trim(),
-                    password: state.credentials.credentials['password']?.trim(),
-                  },
-                },
-                forceSessionsLogout: state.forceSessionsLogout,
-                linkUser,
-                hasOldHash: true,
-              });
-            } catch {}
-          }
-
           if (this.destroyed) {
             notificationService.logException(exception, 'Login failed');
           } else {