mirror of
https://github.com/bitwarden/browser
synced 2025-12-14 07:13:32 +00:00
[PM-687] emergency access invite lost during sso (#5199)
* [PM-687] refactor observable in base accept component * [PM-687] add emergency access invitation to global state * [PM-687] save invite to state and check on login * [PM-687] move emergency access check above queryParams observable
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { Directive, OnInit } from "@angular/core";
|
||||
import { ActivatedRoute, Params, Router } from "@angular/router";
|
||||
import { first } from "rxjs/operators";
|
||||
import { Subject } from "rxjs";
|
||||
import { first, switchMap, takeUntil } from "rxjs/operators";
|
||||
|
||||
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
|
||||
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
||||
@@ -17,6 +18,8 @@ export abstract class BaseAcceptComponent implements OnInit {
|
||||
protected failedShortMessage = "inviteAcceptFailedShort";
|
||||
protected failedMessage = "inviteAcceptFailed";
|
||||
|
||||
private destroy$ = new Subject<void>();
|
||||
|
||||
constructor(
|
||||
protected router: Router,
|
||||
protected platformUtilService: PlatformUtilsService,
|
||||
@@ -29,36 +32,43 @@ export abstract class BaseAcceptComponent implements OnInit {
|
||||
abstract unauthedHandler(qParams: Params): Promise<void>;
|
||||
|
||||
ngOnInit() {
|
||||
// eslint-disable-next-line rxjs/no-async-subscribe
|
||||
this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
|
||||
let error = this.requiredParameters.some((e) => qParams?.[e] == null || qParams[e] === "");
|
||||
let errorMessage: string = null;
|
||||
if (!error) {
|
||||
this.authed = await this.stateService.getIsAuthenticated();
|
||||
this.email = qParams.email;
|
||||
this.route.queryParams
|
||||
.pipe(
|
||||
first(),
|
||||
switchMap(async (qParams) => {
|
||||
let error = this.requiredParameters.some(
|
||||
(e) => qParams?.[e] == null || qParams[e] === ""
|
||||
);
|
||||
let errorMessage: string = null;
|
||||
if (!error) {
|
||||
this.authed = await this.stateService.getIsAuthenticated();
|
||||
this.email = qParams.email;
|
||||
|
||||
if (this.authed) {
|
||||
try {
|
||||
await this.authedHandler(qParams);
|
||||
} catch (e) {
|
||||
error = true;
|
||||
errorMessage = e.message;
|
||||
if (this.authed) {
|
||||
try {
|
||||
await this.authedHandler(qParams);
|
||||
} catch (e) {
|
||||
error = true;
|
||||
errorMessage = e.message;
|
||||
}
|
||||
} else {
|
||||
await this.unauthedHandler(qParams);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
await this.unauthedHandler(qParams);
|
||||
}
|
||||
}
|
||||
|
||||
if (error) {
|
||||
const message =
|
||||
errorMessage != null
|
||||
? this.i18nService.t(this.failedShortMessage, errorMessage)
|
||||
: this.i18nService.t(this.failedMessage);
|
||||
this.platformUtilService.showToast("error", null, message, { timeout: 10000 });
|
||||
this.router.navigate(["/"]);
|
||||
}
|
||||
if (error) {
|
||||
const message =
|
||||
errorMessage != null
|
||||
? this.i18nService.t(this.failedShortMessage, errorMessage)
|
||||
: this.i18nService.t(this.failedMessage);
|
||||
this.platformUtilService.showToast("error", null, message, { timeout: 10000 });
|
||||
this.router.navigate(["/"]);
|
||||
}
|
||||
|
||||
this.loading = false;
|
||||
});
|
||||
this.loading = false;
|
||||
}),
|
||||
takeUntil(this.destroy$)
|
||||
)
|
||||
.subscribe();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ export class AcceptEmergencyComponent extends BaseAcceptComponent {
|
||||
request.token = qParams.token;
|
||||
this.actionPromise = this.apiService.postEmergencyAccessAccept(qParams.id, request);
|
||||
await this.actionPromise;
|
||||
await this.stateService.setEmergencyAccessInvitation(null);
|
||||
this.platformUtilService.showToast(
|
||||
"success",
|
||||
this.i18nService.t("inviteAccepted"),
|
||||
@@ -51,5 +52,8 @@ export class AcceptEmergencyComponent extends BaseAcceptComponent {
|
||||
// Fix URL encoding of space issue with Angular
|
||||
this.name = this.name.replace(/\+/g, " ");
|
||||
}
|
||||
|
||||
// save the invitation to state so sso logins can find it later
|
||||
await this.stateService.setEmergencyAccessInvitation(qParams);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,6 +61,21 @@ export class SsoComponent extends BaseSsoComponent {
|
||||
async ngOnInit() {
|
||||
super.ngOnInit();
|
||||
|
||||
// if we have an emergency access invite, redirect to emergency access
|
||||
const emergencyAccessInvite = await this.stateService.getEmergencyAccessInvitation();
|
||||
if (emergencyAccessInvite != null) {
|
||||
this.onSuccessfulLoginNavigate = async () => {
|
||||
this.router.navigate(["/accept-emergency"], {
|
||||
queryParams: {
|
||||
id: emergencyAccessInvite.id,
|
||||
name: emergencyAccessInvite.name,
|
||||
email: emergencyAccessInvite.email,
|
||||
token: emergencyAccessInvite.token,
|
||||
},
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
||||
this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
|
||||
if (qParams.identifier != null) {
|
||||
|
||||
@@ -87,6 +87,20 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
|
||||
if (previousUrl) {
|
||||
this.router.navigateByUrl(previousUrl);
|
||||
} else {
|
||||
// if we have an emergency access invite, redirect to emergency access
|
||||
const emergencyAccessInvite = await this.stateService.getEmergencyAccessInvitation();
|
||||
if (emergencyAccessInvite != null) {
|
||||
this.router.navigate(["/accept-emergency"], {
|
||||
queryParams: {
|
||||
id: emergencyAccessInvite.id,
|
||||
name: emergencyAccessInvite.name,
|
||||
email: emergencyAccessInvite.email,
|
||||
token: emergencyAccessInvite.token,
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
this.router.navigate([this.successRoute], {
|
||||
queryParams: {
|
||||
identifier: this.identifier,
|
||||
|
||||
Reference in New Issue
Block a user