Move lastSync State (#10272)

apps/web/src/app/app.component.ts

@@ -323,7 +323,6 @@ export class AppComponent implements OnDestroy, OnInit {
     );
 
     await Promise.all([
-      this.syncService.setLastSync(new Date(0)),
       this.cryptoService.clearKeys(),
       this.cipherService.clear(userId),
       this.folderService.clear(userId),

apps/web/src/app/auth/login/login.component.ts

@@ -26,11 +26,12 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
 import { flagEnabled } from "../../../utils/flags";
-import { RouterService, StateService } from "../../core";
+import { RouterService } from "../../core";
 import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
 import { OrganizationInvite } from "../organization-invite/organization-invite";
 

apps/web/src/app/core/core.module.ts

@@ -38,7 +38,6 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { ThemeType } from "@bitwarden/common/platform/enums";
 import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
@@ -71,7 +70,6 @@ import { EventService } from "./event.service";
 import { InitService } from "./init.service";
 import { ModalService } from "./modal.service";
 import { RouterService } from "./router.service";
-import { StateService as WebStateService } from "./state";
 import { WebFileDownloadService } from "./web-file-download.service";
 import { WebPlatformUtilsService } from "./web-platform-utils.service";
 
@@ -135,11 +133,6 @@ const safeProviders: SafeProvider[] = [
     useClass: ModalService,
     useAngularDecorators: true,
   }),
-  safeProvider(WebStateService),
-  safeProvider({
-    provide: StateService,
-    useExisting: WebStateService,
-  }),
   safeProvider({
     provide: FileDownloadService,
     useClass: WebFileDownloadService,

apps/web/src/app/core/index.ts

@@ -1,4 +1,3 @@
 export * from "./core.module";
 export * from "./event.service";
 export * from "./router.service";
-export * from "./state/state.service";

apps/web/src/app/core/state/index.ts

@@ -1 +0,0 @@
-export * from "./state.service";

apps/web/src/app/core/state/state.service.ts

@@ -1,55 +0,0 @@
-import { Inject, Injectable } from "@angular/core";
-
-import {
-  MEMORY_STORAGE,
-  SECURE_STORAGE,
-  STATE_FACTORY,
-} from "@bitwarden/angular/services/injection-tokens";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
-import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
-import { Account } from "@bitwarden/common/platform/models/domain/account";
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
-import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options";
-import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
-import { StateService as BaseStateService } from "@bitwarden/common/platform/services/state.service";
-
-@Injectable()
-export class StateService extends BaseStateService<GlobalState, Account> {
-  constructor(
-    storageService: AbstractStorageService,
-    @Inject(SECURE_STORAGE) secureStorageService: AbstractStorageService,
-    @Inject(MEMORY_STORAGE) memoryStorageService: AbstractStorageService,
-    logService: LogService,
-    @Inject(STATE_FACTORY) stateFactory: StateFactory<GlobalState, Account>,
-    accountService: AccountService,
-    environmentService: EnvironmentService,
-    tokenService: TokenService,
-    migrationRunner: MigrationRunner,
-  ) {
-    super(
-      storageService,
-      secureStorageService,
-      memoryStorageService,
-      logService,
-      stateFactory,
-      accountService,
-      environmentService,
-      tokenService,
-      migrationRunner,
-    );
-  }
-
-  override async getLastSync(options?: StorageOptions): Promise<string> {
-    options = this.reconcileOptions(options, await this.defaultInMemoryOptions());
-    return await super.getLastSync(options);
-  }
-
-  override async setLastSync(value: string, options?: StorageOptions): Promise<void> {
-    options = this.reconcileOptions(options, await this.defaultInMemoryOptions());
-    return await super.setLastSync(value, options);
-  }
-}