Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-02 08:40:08 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #118 from bitwarden/feature/reference-id

Browse Source 
Add referenceId to register component
This commit is contained in:
Chad Scharf 2020-06-25 15:48:51 -04:00 committed by GitHub
commit 57ace40845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/angular/components/register.component.ts
View File

@ -22,6 +22,7 @@ export class RegisterComponent {
showPassword: boolean = false; showPassword: boolean = false;
formPromise: Promise<any>; formPromise: Promise<any>;
masterPasswordScore: number; masterPasswordScore: number;
referenceId: string;
protected successRoute = 'login'; protected successRoute = 'login';
private masterPasswordStrengthTimeout: any; private masterPasswordStrengthTimeout: any;
@ -110,7 +111,7 @@ export class RegisterComponent {
const hashedPassword = await this.cryptoService.hashPassword(this.masterPassword, key); const hashedPassword = await this.cryptoService.hashPassword(this.masterPassword, key);
const keys = await this.cryptoService.makeKeyPair(encKey[0]); const keys = await this.cryptoService.makeKeyPair(encKey[0]);
const request = new RegisterRequest(this.email, this.name, hashedPassword, const request = new RegisterRequest(this.email, this.name, hashedPassword,
this.hint, encKey[1].encryptedString, kdf, kdfIterations); this.hint, encKey[1].encryptedString, kdf, kdfIterations, this.referenceId);
request.keys = new KeysRequest(keys[0], keys[1].encryptedString); request.keys = new KeysRequest(keys[0], keys[1].encryptedString);
const orgInvite = await this.stateService.get<any>('orgInvitation'); const orgInvite = await this.stateService.get<any>('orgInvitation');
if (orgInvite != null && orgInvite.token != null && orgInvite.organizationUserId != null) { if (orgInvite != null && orgInvite.token != null && orgInvite.organizationUserId != null) {

4
src/models/request/registerRequest.ts
View File

@ -13,9 +13,10 @@ export class RegisterRequest {
organizationUserId: string; organizationUserId: string;
kdf: KdfType; kdf: KdfType;
kdfIterations: number; kdfIterations: number;
referenceId: string;
constructor(email: string, name: string, masterPasswordHash: string, masterPasswordHint: string, key: string, constructor(email: string, name: string, masterPasswordHash: string, masterPasswordHint: string, key: string,
kdf: KdfType, kdfIterations: number) { kdf: KdfType, kdfIterations: number, referenceId: string) {
this.name = name; this.name = name;
this.email = email; this.email = email;
this.masterPasswordHash = masterPasswordHash; this.masterPasswordHash = masterPasswordHash;
@ -23,5 +24,6 @@ export class RegisterRequest {
this.key = key; this.key = key;
this.kdf = kdf; this.kdf = kdf;
this.kdfIterations = kdfIterations; this.kdfIterations = kdfIterations;
this.referenceId = referenceId;
} }
} }