bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2026-01-10 04:23:38 +00:00
Code Issues Releases Wiki Activity

Extract createTokenRequest to new method

Browse Source
This commit is contained in:
Thomas Rittson
2021-12-16 11:29:23 +10:00
parent 896e1ef482
commit 897f5565b8
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/services/auth.service.ts
View File

@@ -279,13 +279,12 @@ export class AuthService implements AuthServiceAbstraction {
authingWithPassword(): boolean {
return this.email != null && this.masterPasswordHash != null;
}
private async createTokenRequest(email: string, hashedPassword: string, code: string, codeVerifier: string, redirectUrl: string,
clientId: string, clientSecret: string, twoFactorToken: string, twoFactorProvider: TwoFactorProviderType, remember: boolean,
captchaToken: string) {
private async logInHelper(email: string, hashedPassword: string, localHashedPassword: string, code: string,
codeVerifier: string, redirectUrl: string, clientId: string, clientSecret: string, key: SymmetricCryptoKey,
twoFactorProvider?: TwoFactorProviderType, twoFactorToken?: string, remember?: boolean, captchaToken?: string,
orgId?: string): Promise<AuthResult> {
const storedTwoFactorToken = await this.tokenService.getTwoFactorToken(email);
const appId = await this.appIdService.getAppId();
const storedTwoFactorToken = await this.tokenService.getTwoFactorToken(email);
const deviceRequest = new DeviceRequest(appId, this.platformUtilsService);
let emailPassword: string[] = [];
@@ -322,6 +321,17 @@ export class AuthService implements AuthServiceAbstraction {
null, false, captchaToken, deviceRequest);
}
return request;
}
private async logInHelper(email: string, hashedPassword: string, localHashedPassword: string, code: string,
codeVerifier: string, redirectUrl: string, clientId: string, clientSecret: string, key: SymmetricCryptoKey,
twoFactorProvider?: TwoFactorProviderType, twoFactorToken?: string, remember?: boolean, captchaToken?: string,
orgId?: string): Promise<AuthResult> {
const request = await this.createTokenRequest(email, hashedPassword, code, codeVerifier, redirectUrl,
clientId, clientSecret, twoFactorToken, twoFactorProvider, remember, captchaToken);
const response = await this.apiService.postIdentityToken(request);
this.clearState();