Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Jul 14, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23aa166
CB-5357 resolves auth dialog on successful login (removes no license …
sergeyteleshev Jul 8, 2024
20ba603
Merge branch 'devel' into CB-5357-expiring-license-notification-is-no…
dariamarutkina Jul 8, 2024
0e76896
Merge branch 'devel' into CB-5357-expiring-license-notification-is-no…
sergeyteleshev Jul 11, 2024
08bbf42
CB-5357 fix: do not show 2 notifications
sergeyteleshev Jul 11, 2024
e5dbf68
Merge branch 'devel' into CB-5357-expiring-license-notification-is-no…
sergeyteleshev Jul 12, 2024
baaa36b
CB-5357 reverts authPromise logic
sergeyteleshev Jul 12, 2024
f220c6f
Merge branch 'devel' into CB-5357-expiring-license-notification-is-no…
dariamarutkina Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions webapp/packages/plugin-authentication/src/AuthenticationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
3 changes: 2 additions & 1 deletion webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -89,7 +90,7 @@ export const AuthDialog: DialogComponent<IAuthOptions, null> = observer(function
try {
await dialogData.login(linkUser, provider, configuration);

rejectDialog();
resolveDialog();
} catch {}
}

Expand Down
Loading