mirror of
https://github.com/bitwarden/browser.git
synced 2024-12-19 15:57:42 +01:00
9459cda304
* Require userId for setting masterKeyEncryptedUserKey * Replace folders for specified user * Require userId for collection replace * Cipher Replace requires userId * Require UserId to update equivalent domains * Require userId for policy replace * sync state updates between fake state for better testing * Revert to public observable tests Since they now sync, we can test single-user updates impacting active user observables * Do not init fake states through sync Do not sync initial null values, that might wipe out already existing data. * Require userId for Send replace * Include userId for organization replace * Require userId for billing sync data * Require user Id for key connector sync data * Allow decode of token by userId * Require userId for synced key connector updates * Add userId to policy setting during organization invite accept * Fix cli * Handle null userId --------- Co-authored-by: bnagawiecki <107435978+bnagawiecki@users.noreply.github.com>
278 lines
8.8 KiB
TypeScript
278 lines
8.8 KiB
TypeScript
import { Observable, ReplaySubject, concatMap, filter, firstValueFrom, map, timeout } from "rxjs";
|
|
|
|
import {
|
|
DerivedState,
|
|
GlobalState,
|
|
SingleUserState,
|
|
ActiveUserState,
|
|
KeyDefinition,
|
|
DeriveDefinition,
|
|
UserKeyDefinition,
|
|
} from "../src/platform/state";
|
|
// eslint-disable-next-line import/no-restricted-paths -- using unexposed options for clean typing in test class
|
|
import { StateUpdateOptions } from "../src/platform/state/state-update-options";
|
|
// eslint-disable-next-line import/no-restricted-paths -- using unexposed options for clean typing in test class
|
|
import { CombinedState, activeMarker } from "../src/platform/state/user-state";
|
|
import { UserId } from "../src/types/guid";
|
|
import { DerivedStateDependencies } from "../src/types/state";
|
|
|
|
import { FakeAccountService } from "./fake-account-service";
|
|
|
|
const DEFAULT_TEST_OPTIONS: StateUpdateOptions<any, any> = {
|
|
shouldUpdate: () => true,
|
|
combineLatestWith: null,
|
|
msTimeout: 10,
|
|
};
|
|
|
|
function populateOptionsWithDefault(
|
|
options: StateUpdateOptions<any, any>,
|
|
): StateUpdateOptions<any, any> {
|
|
return {
|
|
...DEFAULT_TEST_OPTIONS,
|
|
...options,
|
|
};
|
|
}
|
|
|
|
export class FakeGlobalState<T> implements GlobalState<T> {
|
|
// eslint-disable-next-line rxjs/no-exposed-subjects -- exposed for testing setup
|
|
stateSubject = new ReplaySubject<T>(1);
|
|
|
|
constructor(initialValue?: T) {
|
|
this.stateSubject.next(initialValue ?? null);
|
|
}
|
|
|
|
nextState(state: T) {
|
|
this.stateSubject.next(state);
|
|
}
|
|
|
|
async update<TCombine>(
|
|
configureState: (state: T, dependency: TCombine) => T,
|
|
options?: StateUpdateOptions<T, TCombine>,
|
|
): Promise<T> {
|
|
options = populateOptionsWithDefault(options);
|
|
if (this.stateSubject["_buffer"].length == 0) {
|
|
// throw a more helpful not initialized error
|
|
throw new Error(
|
|
"You must initialize the state with a value before calling update. Try calling `stateSubject.next(initialState)` before calling update",
|
|
);
|
|
}
|
|
const current = await firstValueFrom(this.state$.pipe(timeout(100)));
|
|
const combinedDependencies =
|
|
options.combineLatestWith != null
|
|
? await firstValueFrom(options.combineLatestWith.pipe(timeout(options.msTimeout)))
|
|
: null;
|
|
if (!options.shouldUpdate(current, combinedDependencies)) {
|
|
return current;
|
|
}
|
|
const newState = configureState(current, combinedDependencies);
|
|
this.stateSubject.next(newState);
|
|
this.nextMock(newState);
|
|
return newState;
|
|
}
|
|
|
|
/** Tracks update values resolved by `FakeState.update` */
|
|
nextMock = jest.fn<void, [T]>();
|
|
|
|
get state$() {
|
|
return this.stateSubject.asObservable();
|
|
}
|
|
|
|
private _keyDefinition: KeyDefinition<T> | null = null;
|
|
get keyDefinition() {
|
|
if (this._keyDefinition == null) {
|
|
throw new Error(
|
|
"Key definition not yet set, usually this means your sut has not asked for this state yet",
|
|
);
|
|
}
|
|
return this._keyDefinition;
|
|
}
|
|
set keyDefinition(value: KeyDefinition<T>) {
|
|
this._keyDefinition = value;
|
|
}
|
|
}
|
|
|
|
export class FakeSingleUserState<T> implements SingleUserState<T> {
|
|
// eslint-disable-next-line rxjs/no-exposed-subjects -- exposed for testing setup
|
|
stateSubject = new ReplaySubject<{
|
|
syncValue: boolean;
|
|
combinedState: CombinedState<T>;
|
|
}>(1);
|
|
|
|
state$: Observable<T>;
|
|
combinedState$: Observable<CombinedState<T>>;
|
|
|
|
constructor(
|
|
readonly userId: UserId,
|
|
initialValue?: T,
|
|
updateSyncCallback?: (userId: UserId, newValue: T) => Promise<void>,
|
|
) {
|
|
// Inform the state provider of updates to keep active user states in sync
|
|
this.stateSubject
|
|
.pipe(
|
|
filter((next) => next.syncValue),
|
|
concatMap(async ({ combinedState }) => {
|
|
await updateSyncCallback?.(...combinedState);
|
|
}),
|
|
)
|
|
.subscribe();
|
|
this.nextState(initialValue ?? null, { syncValue: initialValue != null });
|
|
|
|
this.combinedState$ = this.stateSubject.pipe(map((v) => v.combinedState));
|
|
this.state$ = this.combinedState$.pipe(map(([_userId, state]) => state));
|
|
}
|
|
|
|
nextState(state: T, { syncValue }: { syncValue: boolean } = { syncValue: true }) {
|
|
this.stateSubject.next({
|
|
syncValue,
|
|
combinedState: [this.userId, state],
|
|
});
|
|
}
|
|
|
|
async update<TCombine>(
|
|
configureState: (state: T, dependency: TCombine) => T,
|
|
options?: StateUpdateOptions<T, TCombine>,
|
|
): Promise<T> {
|
|
options = populateOptionsWithDefault(options);
|
|
const current = await firstValueFrom(this.state$.pipe(timeout(options.msTimeout)));
|
|
const combinedDependencies =
|
|
options.combineLatestWith != null
|
|
? await firstValueFrom(options.combineLatestWith.pipe(timeout(options.msTimeout)))
|
|
: null;
|
|
if (!options.shouldUpdate(current, combinedDependencies)) {
|
|
return current;
|
|
}
|
|
const newState = configureState(current, combinedDependencies);
|
|
this.nextState(newState);
|
|
this.nextMock(newState);
|
|
return newState;
|
|
}
|
|
|
|
/** Tracks update values resolved by `FakeState.update` */
|
|
nextMock = jest.fn<void, [T]>();
|
|
private _keyDefinition: UserKeyDefinition<T> | null = null;
|
|
get keyDefinition() {
|
|
if (this._keyDefinition == null) {
|
|
throw new Error(
|
|
"Key definition not yet set, usually this means your sut has not asked for this state yet",
|
|
);
|
|
}
|
|
return this._keyDefinition;
|
|
}
|
|
set keyDefinition(value: UserKeyDefinition<T>) {
|
|
this._keyDefinition = value;
|
|
}
|
|
}
|
|
export class FakeActiveUserState<T> implements ActiveUserState<T> {
|
|
[activeMarker]: true;
|
|
|
|
// eslint-disable-next-line rxjs/no-exposed-subjects -- exposed for testing setup
|
|
stateSubject = new ReplaySubject<{
|
|
syncValue: boolean;
|
|
combinedState: CombinedState<T>;
|
|
}>(1);
|
|
|
|
state$: Observable<T>;
|
|
combinedState$: Observable<CombinedState<T>>;
|
|
|
|
constructor(
|
|
private accountService: FakeAccountService,
|
|
initialValue?: T,
|
|
updateSyncCallback?: (userId: UserId, newValue: T) => Promise<void>,
|
|
) {
|
|
// Inform the state provider of updates to keep single user states in sync
|
|
this.stateSubject.pipe(
|
|
filter((next) => next.syncValue),
|
|
concatMap(async ({ combinedState }) => {
|
|
await updateSyncCallback?.(...combinedState);
|
|
}),
|
|
);
|
|
this.nextState(initialValue ?? null, { syncValue: initialValue != null });
|
|
|
|
this.combinedState$ = this.stateSubject.pipe(map((v) => v.combinedState));
|
|
this.state$ = this.combinedState$.pipe(map(([_userId, state]) => state));
|
|
}
|
|
|
|
get userId() {
|
|
return this.accountService.activeUserId;
|
|
}
|
|
|
|
nextState(state: T, { syncValue }: { syncValue: boolean } = { syncValue: true }) {
|
|
this.stateSubject.next({
|
|
syncValue,
|
|
combinedState: [this.userId, state],
|
|
});
|
|
}
|
|
|
|
async update<TCombine>(
|
|
configureState: (state: T, dependency: TCombine) => T,
|
|
options?: StateUpdateOptions<T, TCombine>,
|
|
): Promise<[UserId, T]> {
|
|
options = populateOptionsWithDefault(options);
|
|
const current = await firstValueFrom(this.state$.pipe(timeout(options.msTimeout)));
|
|
const combinedDependencies =
|
|
options.combineLatestWith != null
|
|
? await firstValueFrom(options.combineLatestWith.pipe(timeout(options.msTimeout)))
|
|
: null;
|
|
if (!options.shouldUpdate(current, combinedDependencies)) {
|
|
return [this.userId, current];
|
|
}
|
|
const newState = configureState(current, combinedDependencies);
|
|
this.nextState(newState);
|
|
this.nextMock([this.userId, newState]);
|
|
return [this.userId, newState];
|
|
}
|
|
|
|
/** Tracks update values resolved by `FakeState.update` */
|
|
nextMock = jest.fn<void, [[UserId, T]]>();
|
|
|
|
private _keyDefinition: UserKeyDefinition<T> | null = null;
|
|
get keyDefinition() {
|
|
if (this._keyDefinition == null) {
|
|
throw new Error(
|
|
"Key definition not yet set, usually this means your sut has not asked for this state yet",
|
|
);
|
|
}
|
|
return this._keyDefinition;
|
|
}
|
|
set keyDefinition(value: UserKeyDefinition<T>) {
|
|
this._keyDefinition = value;
|
|
}
|
|
}
|
|
|
|
export class FakeDerivedState<TFrom, TTo, TDeps extends DerivedStateDependencies>
|
|
implements DerivedState<TTo>
|
|
{
|
|
// eslint-disable-next-line rxjs/no-exposed-subjects -- exposed for testing setup
|
|
stateSubject = new ReplaySubject<TTo>(1);
|
|
|
|
constructor(
|
|
parentState$: Observable<TFrom>,
|
|
deriveDefinition: DeriveDefinition<TFrom, TTo, TDeps>,
|
|
dependencies: TDeps,
|
|
) {
|
|
parentState$
|
|
.pipe(
|
|
concatMap(async (v) => {
|
|
const newState = deriveDefinition.derive(v, dependencies);
|
|
if (newState instanceof Promise) {
|
|
return newState;
|
|
}
|
|
return Promise.resolve(newState);
|
|
}),
|
|
)
|
|
.subscribe((newState) => {
|
|
this.stateSubject.next(newState);
|
|
});
|
|
}
|
|
|
|
forceValue(value: TTo): Promise<TTo> {
|
|
this.stateSubject.next(value);
|
|
return Promise.resolve(value);
|
|
}
|
|
forceValueMock = this.forceValue as jest.MockedFunction<typeof this.forceValue>;
|
|
|
|
get state$() {
|
|
return this.stateSubject.asObservable();
|
|
}
|
|
}
|