mirror of
https://github.com/bitwarden/browser.git
synced 2024-10-09 05:57:40 +02:00
fffef95c5e
* PM-7235 - AuthSvc - Refactor getAuthStatus to simply use the cryptoService.hasUserKey check to determine the user's auth status. * PM-7235 - CryptoSvc - getUserKey - remove setUserKey side effect if auto key is stored. Will move to app init * PM-7235 - For each client init service, add setUserKeyInMemoryIfAutoUserKeySet logic * PM-7235 - CryptoSvc tests - remove uncessary test. * PM-7235 - Create UserKeyInitService and inject into all init services with new listening logic to support acct switching. * PM-7235 - UserKeyInitSvc - minor refactor of setUserKeyInMemoryIfAutoUserKeySet * PM-7235 - Add test suite for UserKeyInitService * PM-7235 - Remove everBeenUnlocked as it is no longer needed * PM-7235 - Fix tests * PM-7235 - UserKeyInitSvc - per PR feedback, add error handling to protect observable stream from being cancelled in case of an error * PM-7235 - Fix tests * Update libs/common/src/platform/services/user-key-init.service.ts Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * Update libs/common/src/platform/services/user-key-init.service.ts Co-authored-by: Matt Gibson <mgibson@bitwarden.com> * PM-7235 - AuthSvc - Per PR review, for getAuthStatus, only check user key existence in memory. * PM-7235 - remove not useful test per PR feedback. * PM-7235 - Per PR feedback, update cryptoService.hasUserKey to only check memory for the user key. * PM-7235 - Per PR feedback, move user key init service listener to main.background instead of init service * PM-7235 - UserKeyInitSvc tests - fix tests to plass --------- Co-authored-by: Matt Gibson <mgibson@bitwarden.com>
53 lines
2.9 KiB
TypeScript
53 lines
2.9 KiB
TypeScript
import { DOCUMENT } from "@angular/common";
|
|
import { Inject, Injectable } from "@angular/core";
|
|
|
|
import { AbstractThemingService } from "@bitwarden/angular/platform/services/theming/theming.service.abstraction";
|
|
import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
|
|
import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
|
|
import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service";
|
|
import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service";
|
|
import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service";
|
|
import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
|
|
import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
|
|
import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
|
|
import { ContainerService } from "@bitwarden/common/platform/services/container.service";
|
|
import { UserKeyInitService } from "@bitwarden/common/platform/services/user-key-init.service";
|
|
import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
|
|
import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/vault-timeout.service";
|
|
|
|
@Injectable()
|
|
export class InitService {
|
|
constructor(
|
|
@Inject(WINDOW) private win: Window,
|
|
private notificationsService: NotificationsServiceAbstraction,
|
|
private vaultTimeoutService: VaultTimeoutService,
|
|
private i18nService: I18nServiceAbstraction,
|
|
private eventUploadService: EventUploadServiceAbstraction,
|
|
private twoFactorService: TwoFactorServiceAbstraction,
|
|
private stateService: StateServiceAbstraction,
|
|
private cryptoService: CryptoServiceAbstraction,
|
|
private themingService: AbstractThemingService,
|
|
private encryptService: EncryptService,
|
|
private userKeyInitService: UserKeyInitService,
|
|
@Inject(DOCUMENT) private document: Document,
|
|
) {}
|
|
|
|
init() {
|
|
return async () => {
|
|
await this.stateService.init();
|
|
this.userKeyInitService.listenForActiveUserChangesToSetUserKey();
|
|
|
|
setTimeout(() => this.notificationsService.init(), 3000);
|
|
await this.vaultTimeoutService.init(true);
|
|
await this.i18nService.init();
|
|
(this.eventUploadService as EventUploadService).init(true);
|
|
this.twoFactorService.init();
|
|
const htmlEl = this.win.document.documentElement;
|
|
htmlEl.classList.add("locale_" + this.i18nService.translationLocale);
|
|
this.themingService.applyThemeChangesTo(this.document);
|
|
const containerService = new ContainerService(this.cryptoService, this.encryptService);
|
|
containerService.attachToGlobal(this.win);
|
|
};
|
|
}
|
|
}
|