Merge pull request #131 from bitwarden/feature/reference-data
Reference id to data conversion
This commit is contained in:
commit
94d363bfca
|
@ -1,6 +1,7 @@
|
|||
import { Router } from '@angular/router';
|
||||
|
||||
import { KeysRequest } from '../../models/request/keysRequest';
|
||||
import { ReferenceEventRequest } from '../../models/request/referenceEventRequest';
|
||||
import { RegisterRequest } from '../../models/request/registerRequest';
|
||||
|
||||
import { ApiService } from '../../abstractions/api.service';
|
||||
|
@ -22,7 +23,7 @@ export class RegisterComponent {
|
|||
showPassword: boolean = false;
|
||||
formPromise: Promise<any>;
|
||||
masterPasswordScore: number;
|
||||
referenceId: string;
|
||||
referenceData: ReferenceEventRequest;
|
||||
|
||||
protected successRoute = 'login';
|
||||
private masterPasswordStrengthTimeout: any;
|
||||
|
@ -111,7 +112,7 @@ export class RegisterComponent {
|
|||
const hashedPassword = await this.cryptoService.hashPassword(this.masterPassword, key);
|
||||
const keys = await this.cryptoService.makeKeyPair(encKey[0]);
|
||||
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);
|
||||
const orgInvite = await this.stateService.get<any>('orgInvitation');
|
||||
if (orgInvite != null && orgInvite.token != null && orgInvite.organizationUserId != null) {
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
export class ReferenceEventRequest {
|
||||
id: string;
|
||||
layout: string;
|
||||
flow: string;
|
||||
}
|
|
@ -1,4 +1,5 @@
|
|||
import { KeysRequest } from './keysRequest';
|
||||
import { ReferenceEventRequest } from './referenceEventRequest';
|
||||
|
||||
import { KdfType } from '../../enums/kdfType';
|
||||
|
||||
|
@ -13,10 +14,10 @@ export class RegisterRequest {
|
|||
organizationUserId: string;
|
||||
kdf: KdfType;
|
||||
kdfIterations: number;
|
||||
referenceId: string;
|
||||
referenceData: ReferenceEventRequest;
|
||||
|
||||
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.email = email;
|
||||
this.masterPasswordHash = masterPasswordHash;
|
||||
|
@ -24,6 +25,6 @@ export class RegisterRequest {
|
|||
this.key = key;
|
||||
this.kdf = kdf;
|
||||
this.kdfIterations = kdfIterations;
|
||||
this.referenceId = referenceId;
|
||||
this.referenceData = referenceData;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue