mirror of
https://github.com/bitwarden/browser
synced 2025-12-12 14:23:32 +00:00
refactor(state): point storage imports to @bitwarden/storage-core (#15414)
This change updates every import of StorageServiceProvider, AbstractStorageService, and ObservableStorageService throughout the common state code (including spec files) to pull from the new @bitwarden/storage-core package instead of their old relative paths. The cuts out one of the issues that needs to be resolved before state can hold its own as a library without importing common.
This commit is contained in:
@@ -6,12 +6,13 @@ import { any, mock } from "jest-mock-extended";
|
|||||||
import { BehaviorSubject, firstValueFrom, map, of, timeout } from "rxjs";
|
import { BehaviorSubject, firstValueFrom, map, of, timeout } from "rxjs";
|
||||||
import { Jsonify } from "type-fest";
|
import { Jsonify } from "type-fest";
|
||||||
|
|
||||||
|
import { StorageServiceProvider } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { awaitAsync, trackEmissions } from "../../../../spec";
|
import { awaitAsync, trackEmissions } from "../../../../spec";
|
||||||
import { FakeStorageService } from "../../../../spec/fake-storage.service";
|
import { FakeStorageService } from "../../../../spec/fake-storage.service";
|
||||||
import { Account } from "../../../auth/abstractions/account.service";
|
import { Account } from "../../../auth/abstractions/account.service";
|
||||||
import { UserId } from "../../../types/guid";
|
import { UserId } from "../../../types/guid";
|
||||||
import { LogService } from "../../abstractions/log.service";
|
import { LogService } from "../../abstractions/log.service";
|
||||||
import { StorageServiceProvider } from "../../services/storage-service.provider";
|
|
||||||
import { StateDefinition } from "../state-definition";
|
import { StateDefinition } from "../state-definition";
|
||||||
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
||||||
import { UserKeyDefinition } from "../user-key-definition";
|
import { UserKeyDefinition } from "../user-key-definition";
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
// FIXME: Update this file to be type safe and remove this and next line
|
// FIXME: Update this file to be type safe and remove this and next line
|
||||||
// @ts-strict-ignore
|
// @ts-strict-ignore
|
||||||
|
import { StorageServiceProvider } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { LogService } from "../../abstractions/log.service";
|
import { LogService } from "../../abstractions/log.service";
|
||||||
import { StorageServiceProvider } from "../../services/storage-service.provider";
|
|
||||||
import { GlobalState } from "../global-state";
|
import { GlobalState } from "../global-state";
|
||||||
import { GlobalStateProvider } from "../global-state.provider";
|
import { GlobalStateProvider } from "../global-state.provider";
|
||||||
import { KeyDefinition } from "../key-definition";
|
import { KeyDefinition } from "../key-definition";
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
|
import { AbstractStorageService, ObservableStorageService } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { LogService } from "../../abstractions/log.service";
|
import { LogService } from "../../abstractions/log.service";
|
||||||
import {
|
|
||||||
AbstractStorageService,
|
|
||||||
ObservableStorageService,
|
|
||||||
} from "../../abstractions/storage.service";
|
|
||||||
import { GlobalState } from "../global-state";
|
import { GlobalState } from "../global-state";
|
||||||
import { KeyDefinition, globalKeyBuilder } from "../key-definition";
|
import { KeyDefinition, globalKeyBuilder } from "../key-definition";
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
// FIXME: Update this file to be type safe and remove this and next line
|
// FIXME: Update this file to be type safe and remove this and next line
|
||||||
// @ts-strict-ignore
|
// @ts-strict-ignore
|
||||||
|
import { StorageServiceProvider } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { UserId } from "../../../types/guid";
|
import { UserId } from "../../../types/guid";
|
||||||
import { LogService } from "../../abstractions/log.service";
|
import { LogService } from "../../abstractions/log.service";
|
||||||
import { StorageServiceProvider } from "../../services/storage-service.provider";
|
|
||||||
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
||||||
import { UserKeyDefinition } from "../user-key-definition";
|
import { UserKeyDefinition } from "../user-key-definition";
|
||||||
import { SingleUserState } from "../user-state";
|
import { SingleUserState } from "../user-state";
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
import { Observable, combineLatest, of } from "rxjs";
|
import { Observable, combineLatest, of } from "rxjs";
|
||||||
|
|
||||||
|
import { AbstractStorageService, ObservableStorageService } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { UserId } from "../../../types/guid";
|
import { UserId } from "../../../types/guid";
|
||||||
import { LogService } from "../../abstractions/log.service";
|
import { LogService } from "../../abstractions/log.service";
|
||||||
import {
|
|
||||||
AbstractStorageService,
|
|
||||||
ObservableStorageService,
|
|
||||||
} from "../../abstractions/storage.service";
|
|
||||||
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
||||||
import { UserKeyDefinition } from "../user-key-definition";
|
import { UserKeyDefinition } from "../user-key-definition";
|
||||||
import { CombinedState, SingleUserState } from "../user-state";
|
import { CombinedState, SingleUserState } from "../user-state";
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import { mock } from "jest-mock-extended";
|
import { mock } from "jest-mock-extended";
|
||||||
|
|
||||||
|
import { StorageServiceProvider } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { mockAccountServiceWith } from "../../../../spec/fake-account-service";
|
import { mockAccountServiceWith } from "../../../../spec/fake-account-service";
|
||||||
import { FakeStorageService } from "../../../../spec/fake-storage.service";
|
import { FakeStorageService } from "../../../../spec/fake-storage.service";
|
||||||
import { UserId } from "../../../types/guid";
|
import { UserId } from "../../../types/guid";
|
||||||
import { LogService } from "../../abstractions/log.service";
|
import { LogService } from "../../abstractions/log.service";
|
||||||
import { StorageServiceProvider } from "../../services/storage-service.provider";
|
|
||||||
import { KeyDefinition } from "../key-definition";
|
import { KeyDefinition } from "../key-definition";
|
||||||
import { StateDefinition } from "../state-definition";
|
import { StateDefinition } from "../state-definition";
|
||||||
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
import { StateEventRegistrarService } from "../state-event-registrar.service";
|
||||||
|
|||||||
@@ -15,12 +15,10 @@ import {
|
|||||||
} from "rxjs";
|
} from "rxjs";
|
||||||
import { Jsonify } from "type-fest";
|
import { Jsonify } from "type-fest";
|
||||||
|
|
||||||
|
import { AbstractStorageService, ObservableStorageService } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { StorageKey } from "../../../types/state";
|
import { StorageKey } from "../../../types/state";
|
||||||
import { LogService } from "../../abstractions/log.service";
|
import { LogService } from "../../abstractions/log.service";
|
||||||
import {
|
|
||||||
AbstractStorageService,
|
|
||||||
ObservableStorageService,
|
|
||||||
} from "../../abstractions/storage.service";
|
|
||||||
import { DebugOptions } from "../key-definition";
|
import { DebugOptions } from "../key-definition";
|
||||||
import { populateOptionsWithDefault, StateUpdateOptions } from "../state-update-options";
|
import { populateOptionsWithDefault, StateUpdateOptions } from "../state-update-options";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Jsonify } from "type-fest";
|
import { Jsonify } from "type-fest";
|
||||||
|
|
||||||
import { AbstractStorageService } from "../../abstractions/storage.service";
|
import { AbstractStorageService } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
export async function getStoredValue<T>(
|
export async function getStoredValue<T>(
|
||||||
key: string,
|
key: string,
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
import { mock } from "jest-mock-extended";
|
import { mock } from "jest-mock-extended";
|
||||||
|
|
||||||
|
import {
|
||||||
|
AbstractStorageService,
|
||||||
|
ObservableStorageService,
|
||||||
|
StorageServiceProvider,
|
||||||
|
} from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { FakeGlobalStateProvider } from "../../../spec";
|
import { FakeGlobalStateProvider } from "../../../spec";
|
||||||
import { AbstractStorageService, ObservableStorageService } from "../abstractions/storage.service";
|
|
||||||
import { StorageServiceProvider } from "../services/storage-service.provider";
|
|
||||||
|
|
||||||
import { StateDefinition } from "./state-definition";
|
import { StateDefinition } from "./state-definition";
|
||||||
import { STATE_LOCK_EVENT, StateEventRegistrarService } from "./state-event-registrar.service";
|
import { STATE_LOCK_EVENT, StateEventRegistrarService } from "./state-event-registrar.service";
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
import { mock } from "jest-mock-extended";
|
import { mock } from "jest-mock-extended";
|
||||||
|
|
||||||
|
import {
|
||||||
|
AbstractStorageService,
|
||||||
|
ObservableStorageService,
|
||||||
|
StorageServiceProvider,
|
||||||
|
} from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { FakeGlobalStateProvider } from "../../../spec";
|
import { FakeGlobalStateProvider } from "../../../spec";
|
||||||
import { UserId } from "../../types/guid";
|
import { UserId } from "../../types/guid";
|
||||||
import { AbstractStorageService, ObservableStorageService } from "../abstractions/storage.service";
|
|
||||||
import { StorageServiceProvider } from "../services/storage-service.provider";
|
|
||||||
|
|
||||||
import { STATE_LOCK_EVENT } from "./state-event-registrar.service";
|
import { STATE_LOCK_EVENT } from "./state-event-registrar.service";
|
||||||
import { StateEventRunnerService } from "./state-event-runner.service";
|
import { StateEventRunnerService } from "./state-event-runner.service";
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
// @ts-strict-ignore
|
// @ts-strict-ignore
|
||||||
import { firstValueFrom } from "rxjs";
|
import { firstValueFrom } from "rxjs";
|
||||||
|
|
||||||
|
import { StorageServiceProvider } from "@bitwarden/storage-core";
|
||||||
|
|
||||||
import { UserId } from "../../types/guid";
|
import { UserId } from "../../types/guid";
|
||||||
import { StorageServiceProvider } from "../services/storage-service.provider";
|
|
||||||
|
|
||||||
import { GlobalState } from "./global-state";
|
import { GlobalState } from "./global-state";
|
||||||
import { GlobalStateProvider } from "./global-state.provider";
|
import { GlobalStateProvider } from "./global-state.provider";
|
||||||
|
|||||||
Reference in New Issue
Block a user