bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-09 21:20:27 +00:00
Code Issues Releases Wiki Activity

Move TwoFactorFormView into service and rename to remove "view" and "form"

Browse Source
This commit is contained in:
Alec Rippberger
2025-04-10 15:22:52 -05:00
parent 42a4b081d1
commit 116c4ec5ed
2 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libs/auth/src/common/services/auth-request/default-two-factor-form-cache.service.ts
View File

@@ -1,12 +1,26 @@
import { inject, Injectable, WritableSignal } from "@angular/core";
import { Jsonify } from "type-fest";
import { ViewCacheService } from "@bitwarden/angular/platform/abstractions/view-cache.service";
import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
import { TwoFactorFormView } from "@bitwarden/common/auth/models/view/two-factor-form.view";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
const TWO_FACTOR_FORM_CACHE_KEY = "two-factor-form-cache";
const TWO_FACTOR_AUTH_CACHE_KEY = "two-factor-auth-cache";
/**
* This is a cache model for the two factor authentication data.
*/
export class TwoFactorAuthCache {
token: string | undefined = undefined;
remember: boolean | undefined = undefined;
selectedProviderType: TwoFactorProviderType | undefined = undefined;
emailSent: boolean | undefined = undefined;
static fromJSON(obj: Partial<Jsonify<TwoFactorAuthCache>>): TwoFactorAuthCache {
return Object.assign(new TwoFactorAuthCache(), obj);
}
}
export interface TwoFactorFormData {
token?: string;
@@ -32,11 +46,11 @@ export class DefaultTwoFactorFormCacheService {
/**
* Signal for the cached TwoFactorFormData.
*/
private defaultTwoFactorFormCache: WritableSignal<TwoFactorFormView | null> =
this.viewCacheService.signal<TwoFactorFormView | null>({
key: TWO_FACTOR_FORM_CACHE_KEY,
private defaultTwoFactorAuthCache: WritableSignal<TwoFactorAuthCache | null> =
this.viewCacheService.signal<TwoFactorAuthCache | null>({
key: TWO_FACTOR_AUTH_CACHE_KEY,
initialValue: null,
deserializer: TwoFactorFormView.fromJSON,
deserializer: TwoFactorAuthCache.fromJSON,
});
constructor() {}
@@ -58,12 +72,12 @@ export class DefaultTwoFactorFormCacheService {
return;
}
this.defaultTwoFactorFormCache.set({
this.defaultTwoFactorAuthCache.set({
token: data.token,
remember: data.remember,
selectedProviderType: data.selectedProviderType,
emailSent: data.emailSent,
} as TwoFactorFormView);
} as TwoFactorAuthCache);
}
/**
@@ -74,17 +88,17 @@ export class DefaultTwoFactorFormCacheService {
return;
}
this.defaultTwoFactorFormCache.set(null);
this.defaultTwoFactorAuthCache.set(null);
}
/**
* Returns the cached TwoFactorFormData when available.
*/
getCachedTwoFactorFormData(): TwoFactorFormView | null {
getCachedTwoFactorFormData(): TwoFactorAuthCache | null {
if (!this.featureEnabled) {
return null;
}
return this.defaultTwoFactorFormCache();
return this.defaultTwoFactorAuthCache();
}
}

19
libs/common/src/auth/models/view/two-factor-form.view.ts
View File

@@ -1,19 +0,0 @@
import { Jsonify } from "type-fest";
import { View } from "@bitwarden/common/models/view/view";
import { TwoFactorProviderType } from "../../enums/two-factor-provider-type";
/**
* This is a cache model for the two factor form.
*/
export class TwoFactorFormView implements View {
token: string | undefined = undefined;
remember: boolean | undefined = undefined;
selectedProviderType: TwoFactorProviderType | undefined = undefined;
emailSent: boolean | undefined = undefined;
static fromJSON(obj: Partial<Jsonify<TwoFactorFormView>>): TwoFactorFormView {
return Object.assign(new TwoFactorFormView(), obj);
}
}