bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-17 08:43:18 +00:00
Code Issues Releases Wiki Activity

Add helper methods to authResult

Browse Source
This commit is contained in:
Thomas Rittson
2021-12-20 12:34:57 +10:00
parent 9c22bfd1e8
commit c2f21e03a9
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/models/domain/authResult.ts
View File

@@ -1,9 +1,19 @@
import { TwoFactorProviderType } from "../../enums/twoFactorProviderType"; import { TwoFactorProviderType } from "../../enums/twoFactorProviderType";
import { Utils } from "../../misc/utils";
export class AuthResult { export class AuthResult {
twoFactor: boolean = false; twoFactor: boolean = false;
captchaSiteKey: string = ""; captchaSiteKey: string = "";
resetMasterPassword: boolean = false; resetMasterPassword: boolean = false;
forcePasswordReset: boolean = false; forcePasswordReset: boolean = false;
twoFactorProviders: Map<TwoFactorProviderType, { [key: string]: string }> = null; twoFactorProviders: Map<TwoFactorProviderType, { [key: string]: string }> = null;
get requiresCaptcha() {
return !Utils.isNullOrWhitespace(this.captchaSiteKey);
}
get requiresTwoFactor() {
return this.twoFactor;
}
} }

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

@@ -270,12 +270,12 @@ export class AuthService implements AuthServiceAbstraction {
const result = new AuthResult(); const result = new AuthResult();
result.captchaSiteKey = (response as any).siteKey; result.captchaSiteKey = (response as any).siteKey;
if (!!result.captchaSiteKey) { if (result.requiresCaptcha) {
return result; return result;
} }
result.twoFactor = !!(response as any).twoFactorProviders2; result.twoFactor = (response as any).twoFactorProviders2 != null;
if (result.twoFactor) { if (result.requiresTwoFactor) {
result.twoFactorProviders = (response as IdentityTwoFactorResponse).twoFactorProviders2; result.twoFactorProviders = (response as IdentityTwoFactorResponse).twoFactorProviders2;
return result; return result;
} }

2
spec/common/services/auth.service.spec.ts
View File

@@ -155,7 +155,7 @@ describe("Cipher Service", () => {
function newTokenResponse() { function newTokenResponse() {
const tokenResponse = new IdentityTokenResponse({}); const tokenResponse = new IdentityTokenResponse({});
(tokenResponse as any).twoFactorProviders2 = false; (tokenResponse as any).twoFactorProviders2 = null;
(tokenResponse as any).siteKey = undefined; (tokenResponse as any).siteKey = undefined;
tokenResponse.resetMasterPassword = false; tokenResponse.resetMasterPassword = false;
tokenResponse.forcePasswordReset = false; tokenResponse.forcePasswordReset = false;