mirror of
https://github.com/bitwarden/browser.git
synced 2025-02-06 23:51:28 +01:00
fxies
This commit is contained in:
parent
bdc021be27
commit
67b1d39fef
@ -8,5 +8,5 @@ import { VaultOnboardingTasks } from "../vault-onboarding.service";
|
||||
|
||||
export abstract class VaultOnboardingService {
|
||||
abstract setVaultOnboardingTasks(newState: VaultOnboardingTasks): Promise<void>;
|
||||
abstract vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks | null>;
|
||||
abstract vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks>;
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { Injectable } from "@angular/core";
|
||||
import { Observable } from "rxjs";
|
||||
import { Injectable, OnDestroy } from "@angular/core";
|
||||
import { Observable, Subject, takeUntil } from "rxjs";
|
||||
|
||||
import {
|
||||
SingleUserState,
|
||||
@ -27,17 +27,29 @@ const VAULT_ONBOARDING_KEY = new UserKeyDefinition<VaultOnboardingTasks>(
|
||||
);
|
||||
|
||||
@Injectable()
|
||||
export class VaultOnboardingService implements VaultOnboardingServiceAbstraction {
|
||||
private vaultOnboardingState?: SingleUserState<VaultOnboardingTasks> = null;
|
||||
export class VaultOnboardingService implements VaultOnboardingServiceAbstraction, OnDestroy {
|
||||
private destroy$ = new Subject<void>();
|
||||
private vaultOnboardingState: SingleUserState<VaultOnboardingTasks> | undefined;
|
||||
|
||||
constructor(private stateProvider: StateProvider) {}
|
||||
constructor(private stateProvider: StateProvider) {
|
||||
this.stateProvider.activeUserId$.pipe(takeUntil(this.destroy$)).subscribe((userId) => {
|
||||
if (userId) {
|
||||
this.vaultOnboardingState = this.stateProvider.getUser(userId, VAULT_ONBOARDING_KEY);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks | null> {
|
||||
ngOnDestroy(): void {
|
||||
this.destroy$.next();
|
||||
this.destroy$.complete();
|
||||
}
|
||||
|
||||
vaultOnboardingState$(userId: UserId): Observable<VaultOnboardingTasks> {
|
||||
this.vaultOnboardingState = this.stateProvider.getUser(userId, VAULT_ONBOARDING_KEY);
|
||||
return this.vaultOnboardingState.state$;
|
||||
}
|
||||
async setVaultOnboardingTasks(newState: VaultOnboardingTasks): Promise<void> {
|
||||
await this.vaultOnboardingState?.update(() => {
|
||||
await this.vaultOnboardingState.update(() => {
|
||||
return { ...newState };
|
||||
});
|
||||
}
|
||||
|
@ -44,6 +44,7 @@ describe("VaultOnboardingComponent", () => {
|
||||
};
|
||||
mockVaultOnboardingService = mock<VaultOnboardingServiceAbstraction>();
|
||||
mockStateProvider = {
|
||||
activeUserId$: of(Utils.newGuid() as UserId),
|
||||
getUser: jest.fn().mockReturnValue(
|
||||
of({
|
||||
createAccount: true,
|
||||
|
Loading…
Reference in New Issue
Block a user