CB-5357 Expiring license notification is not shown after login (#2767)

* CB-5357 resolves auth dialog on successful login (removes no license notification bug on login) * CB-5357 fix: do not show 2 notifications * CB-5357 reverts authPromise logic --------- Co-authored-by: Daria Marutkina <[email protected]>
dbeaver · Jul 14, 2024 · fb9cd47 · fb9cd47
1 parent 364cb6e
commit fb9cd47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/webapp/packages/plugin-authentication/src/AuthenticationService.ts b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
@@ -161,6 +161,11 @@ export class AuthenticationService extends Bootstrap {
       }
     }
 
+    if (this.authPromise) {
+      await this.waitAuth();
+      return;
+    }
+
     this.authPromise = this.authDialogService
       .showLoginForm(persistent, options)
       .then(async state => {

diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
@@ -42,6 +42,7 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
   payload: { providerId, configurationId, linkUser = false, accessRequest = false },
   options,
   rejectDialog,
+  resolveDialog,
 }) {
   const styles = useS(style);
   const dialogData = useAuthDialogState(accessRequest, providerId, configurationId);
@@ -89,7 +90,7 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
     try {
       await dialogData.login(linkUser, provider, configuration);
 
-      rejectDialog();
+      resolveDialog();
     } catch {}
   }