github-starred/bitwarden-clients
2
0
Fork 0
mirror of https://github.com/bitwarden/clients.git synced 2025-12-05 19:17:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

PM-28536 making a change from getActive to getUser because of method being deprecated

Browse Source
This commit is contained in:
Graham Walker
2025-12-05 11:48:55 -06:00
parent 232bcff3c1
commit 14c1cbbadb
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/common/src/dirt/services/phishing-detection-settings.service.ts
View File

@@ -1,14 +1,9 @@
import { Observable } from "rxjs";
import { Observable, switchMap } from "rxjs";
import { map } from "rxjs/operators";
import { UserId } from "@bitwarden/user-core";
import {
ActiveUserState,
PHISHING_DETECTION_DISK,
StateProvider,
UserKeyDefinition,
} from "../../platform/state";
import { PHISHING_DETECTION_DISK, StateProvider, UserKeyDefinition } from "../../platform/state";
const ENABLE_PHISHING_DETECTION = new UserKeyDefinition(
PHISHING_DETECTION_DISK,
@@ -38,14 +33,15 @@ export abstract class PhishingDetectionSettingsServiceAbstraction {
export class PhishingDetectionSettingsService
implements PhishingDetectionSettingsServiceAbstraction
{
private enablePhishingDetectionState: ActiveUserState<boolean>;
readonly enablePhishingDetection$: Observable<boolean>;
constructor(private stateProvider: StateProvider) {
// Use getGlobal() for client-level setting
this.enablePhishingDetectionState = this.stateProvider.getActive(ENABLE_PHISHING_DETECTION);
this.enablePhishingDetection$ = this.enablePhishingDetectionState.state$.pipe(
this.enablePhishingDetection$ = this.stateProvider.activeUserId$.pipe(
switchMap((userId) =>
userId != null
? this.stateProvider.getUser(userId, ENABLE_PHISHING_DETECTION).state$
: [true],
),
map((x) => x ?? true),
);
}