Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-23 03:22:50 +02:00
Code Issues Projects Releases Wiki Activity

Auth/PM-11969 - Registration with Email Verification - Accept Emergency Access Invite Flow (#11018)

Browse Source 
* PM-11969 - Registration with Email Verification - Accept Emergency Access Invite Fixed

* PM-11969 - Fix PR feedback

* PM-11969 - AcceptEmergencyComponent - remove prop
This commit is contained in:
Jared Snider 2024-09-12 20:14:37 -04:00 committed by GitHub
parent fe96aa85f2
commit bd3863c313
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/web/src/app/auth/core/services/registration/web-registration-finish.service.ts
View File

@ -71,6 +71,8 @@ export class WebRegistrationFinishService
userAsymmetricKeys: [string, EncString],
emailVerificationToken?: string,
orgSponsoredFreeFamilyPlanToken?: string,
acceptEmergencyAccessInviteToken?: string,
emergencyAccessId?: string,
): Promise<RegisterFinishRequest> {
const registerRequest = await super.buildRegisterRequest(
email,
@ -94,6 +96,11 @@ export class WebRegistrationFinishService
registerRequest.orgSponsoredFreeFamilyPlanToken = orgSponsoredFreeFamilyPlanToken;
}
if (acceptEmergencyAccessInviteToken && emergencyAccessId) {
registerRequest.acceptEmergencyAccessInviteToken = acceptEmergencyAccessInviteToken;
registerRequest.acceptEmergencyAccessId = emergencyAccessId;
}
return registerRequest;
}
}

10
apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.html
View File

@ -26,14 +26,8 @@
>
{{ "logIn" | i18n }}
</a>
<a
bitButton
buttonType="primary"
[routerLink]="registerRoute$ | async"
[queryParams]="{ email: email }"
[block]="true"
>
<button type="button" bitButton buttonType="primary" (click)="register()" [block]="true">
{{ "createAccount" | i18n }}
</a>
</button>
</div>
</div>

34
apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.ts
View File

@ -1,5 +1,6 @@
import { Component } from "@angular/core";
import { ActivatedRoute, Params, Router } from "@angular/router";
import { firstValueFrom } from "rxjs";
import { RegisterRouteService } from "@bitwarden/auth/common";
import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
@ -18,6 +19,8 @@ import { EmergencyAccessService } from "../services/emergency-access.service";
})
export class AcceptEmergencyComponent extends BaseAcceptComponent {
name: string;
emergencyAccessId: string;
acceptEmergencyAccessInviteToken: string;
protected requiredParameters: string[] = ["id", "name", "email", "token"];
protected failedShortMessage = "emergencyInviteAcceptFailedShort";
@ -55,5 +58,36 @@ export class AcceptEmergencyComponent extends BaseAcceptComponent {
// Fix URL encoding of space issue with Angular
this.name = this.name.replace(/\+/g, " ");
}
if (qParams.id) {
this.emergencyAccessId = qParams.id;
}
if (qParams.token) {
this.acceptEmergencyAccessInviteToken = qParams.token;
}
}
async register() {
let queryParams: Params;
let registerRoute = await firstValueFrom(this.registerRoute$);
if (registerRoute === "/register") {
queryParams = {
email: this.email,
};
} else if (registerRoute === "/signup") {
// We have to override the base component route as we don't need users to
// complete email verification if they are coming directly an emailed invite.
registerRoute = "/finish-signup";
queryParams = {
email: this.email,
acceptEmergencyAccessInviteToken: this.acceptEmergencyAccessInviteToken,
emergencyAccessId: this.emergencyAccessId,
};
}
await this.router.navigate([registerRoute], {
queryParams: queryParams,
});
}
}

6
libs/auth/src/angular/registration/registration-finish/default-registration-finish.service.ts
View File

@ -24,6 +24,8 @@ export class DefaultRegistrationFinishService implements RegistrationFinishServi
passwordInputResult: PasswordInputResult,
emailVerificationToken?: string,
orgSponsoredFreeFamilyPlanToken?: string,
acceptEmergencyAccessInviteToken?: string,
emergencyAccessId?: string,
): Promise<string> {
const [newUserKey, newEncUserKey] = await this.cryptoService.makeUserKey(
passwordInputResult.masterKey,
@ -41,6 +43,8 @@ export class DefaultRegistrationFinishService implements RegistrationFinishServi
userAsymmetricKeys,
emailVerificationToken,
orgSponsoredFreeFamilyPlanToken,
acceptEmergencyAccessInviteToken,
emergencyAccessId,
);
const capchaBypassToken = await this.accountApiService.registerFinish(registerRequest);
@ -55,6 +59,8 @@ export class DefaultRegistrationFinishService implements RegistrationFinishServi
userAsymmetricKeys: [string, EncString],
emailVerificationToken?: string,
orgSponsoredFreeFamilyPlanToken?: string, // web only
acceptEmergencyAccessInviteToken?: string, // web only
emergencyAccessId?: string, // web only
): Promise<RegisterFinishRequest> {
const userAsymmetricKeysRequest = new KeysRequest(
userAsymmetricKeys[0],

11
libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
View File

@ -44,6 +44,10 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
// setup a free family plan sponsored by an organization but they don't have an account yet.
orgSponsoredFreeFamilyPlanToken: string;
// this token is provided when the user is coming from an emailed invite to accept an emergency access invite
acceptEmergencyAccessInviteToken: string;
emergencyAccessId: string;
masterPasswordPolicyOptions: MasterPasswordPolicyOptions | null = null;
constructor(
@ -79,6 +83,11 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
if (qParams.orgSponsoredFreeFamilyPlanToken != null) {
this.orgSponsoredFreeFamilyPlanToken = qParams.orgSponsoredFreeFamilyPlanToken;
}
if (qParams.acceptEmergencyAccessInviteToken != null && qParams.emergencyAccessId) {
this.acceptEmergencyAccessInviteToken = qParams.acceptEmergencyAccessInviteToken;
this.emergencyAccessId = qParams.emergencyAccessId;
}
}),
switchMap((qParams: Params) => {
if (
@ -111,6 +120,8 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
passwordInputResult,
this.emailVerificationToken,
this.orgSponsoredFreeFamilyPlanToken,
this.acceptEmergencyAccessInviteToken,
this.emergencyAccessId,
);
} catch (e) {
this.validationService.showError(e);

4
libs/auth/src/angular/registration/registration-finish/registration-finish.service.ts
View File

@ -16,6 +16,8 @@ export abstract class RegistrationFinishService {
* @param passwordInputResult The password input result.
* @param emailVerificationToken The optional email verification token. Not present in emailed invite scenarios (ex: org invite).
* @param orgSponsoredFreeFamilyPlanToken The optional org sponsored free family plan token.
* @param acceptEmergencyAccessInviteToken The optional accept emergency access invite token.
* @param emergencyAccessId The optional emergency access id which is required to validate the emergency access invite token.
* Returns a promise which resolves to the captcha bypass token string upon a successful account creation.
*/
abstract finishRegistration(
@ -23,5 +25,7 @@ export abstract class RegistrationFinishService {
passwordInputResult: PasswordInputResult,
emailVerificationToken?: string,
orgSponsoredFreeFamilyPlanToken?: string,
acceptEmergencyAccessInviteToken?: string,
emergencyAccessId?: string,
): Promise<string>;
}

2
libs/common/src/auth/models/request/registration/register-finish.request.ts
View File

@ -19,6 +19,8 @@ export class RegisterFinishRequest {
public emailVerificationToken?: string,
public orgSponsoredFreeFamilyPlanToken?: string,
public acceptEmergencyAccessInviteToken?: string,
public acceptEmergencyAccessId?: string,
// Org Invite data (only applies on web)
public organizationUserId?: string,