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

Merge pull request #131 from bitwarden/feature/reference-data

Browse Source 
Reference id to data conversion
This commit is contained in:
Chad Scharf 2020-07-20 15:58:58 -04:00 committed by GitHub
commit 94d363bfca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { KeysRequest } from '../../models/request/keysRequest'; import { KeysRequest } from '../../models/request/keysRequest';
import { ReferenceEventRequest } from '../../models/request/referenceEventRequest';
import { RegisterRequest } from '../../models/request/registerRequest'; import { RegisterRequest } from '../../models/request/registerRequest';
import { ApiService } from '../../abstractions/api.service'; import { ApiService } from '../../abstractions/api.service';
@ -22,7 +23,7 @@ export class RegisterComponent {
showPassword: boolean = false; showPassword: boolean = false;
formPromise: Promise<any>; formPromise: Promise<any>;
masterPasswordScore: number; masterPasswordScore: number;
referenceId: string; referenceData: ReferenceEventRequest;
protected successRoute = 'login'; protected successRoute = 'login';
private masterPasswordStrengthTimeout: any; private masterPasswordStrengthTimeout: any;
@ -111,7 +112,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.referenceId); this.hint, encKey[1].encryptedString, kdf, kdfIterations, this.referenceData);
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) {

5
src/models/request/referenceEventRequest.ts Normal file
View File

@ -0,0 +1,5 @@
export class ReferenceEventRequest {
id: string;
layout: string;
flow: string;
}

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

@ -1,4 +1,5 @@
import { KeysRequest } from './keysRequest'; import { KeysRequest } from './keysRequest';
import { ReferenceEventRequest } from './referenceEventRequest';
import { KdfType } from '../../enums/kdfType'; import { KdfType } from '../../enums/kdfType';
@ -13,10 +14,10 @@ export class RegisterRequest {
organizationUserId: string; organizationUserId: string;
kdf: KdfType; kdf: KdfType;
kdfIterations: number; kdfIterations: number;
referenceId: string; referenceData: ReferenceEventRequest;
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, referenceId: string) { kdf: KdfType, kdfIterations: number, referenceData: ReferenceEventRequest) {
this.name = name; this.name = name;
this.email = email; this.email = email;
this.masterPasswordHash = masterPasswordHash; this.masterPasswordHash = masterPasswordHash;
@ -24,6 +25,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; this.referenceData = referenceData;
} }
} }