mirror of
https://github.com/bitwarden/browser
synced 2025-12-28 14:13:22 +00:00
* Use account service to track accounts and active account * Remove state service active account Observables. * Add email verified to account service * Do not store account info on logged out accounts * Add account activity tracking to account service * Use last account activity from account service * migrate or replicate account service data * Add `AccountActivityService` that handles storing account last active data * Move active and next active user to account service * Remove authenticated accounts from state object * Fold account activity into account service * Fix builds * Fix desktop app switch * Fix logging out non active user * Expand helper to handle new authenticated accounts location * Prefer view observable to tons of async pipes * Fix `npm run test:types` * Correct user activity sorting test * Be more precise about log out messaging * Fix dev compare errors All stored values are serializable, the next step wasn't necessary and was erroring on some types that lack `toString`. * If the account in unlocked on load of lock component, navigate away from lock screen * Handle no users case for auth service statuses * Specify account to switch to * Filter active account out of inactive accounts * Prefer constructor init * Improve comparator * Use helper methods internally * Fixup component tests * Clarify name * Ensure accounts object has only valid userIds * Capitalize const values * Prefer descriptive, single-responsibility guards * Update libs/common/src/state-migrations/migrate.ts Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com> * Fix merge * Add user Id validation activity for undefined was being set, which was resulting in requests for the auth status of `"undefined"` (string) userId, due to key enumeration. These changes stop that at both locations, as well as account add for good measure. --------- Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
151 lines
5.4 KiB
TypeScript
151 lines
5.4 KiB
TypeScript
import { firstValueFrom, map, timeout } from "rxjs";
|
|
|
|
import { VaultTimeoutSettingsService } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
|
|
import { AccountService } from "../../auth/abstractions/account.service";
|
|
import { AuthService } from "../../auth/abstractions/auth.service";
|
|
import { AuthenticationStatus } from "../../auth/enums/authentication-status";
|
|
import { AutofillSettingsServiceAbstraction } from "../../autofill/services/autofill-settings.service";
|
|
import { VaultTimeoutAction } from "../../enums/vault-timeout-action.enum";
|
|
import { UserId } from "../../types/guid";
|
|
import { MessagingService } from "../abstractions/messaging.service";
|
|
import { PlatformUtilsService } from "../abstractions/platform-utils.service";
|
|
import { StateService } from "../abstractions/state.service";
|
|
import { SystemService as SystemServiceAbstraction } from "../abstractions/system.service";
|
|
import { BiometricStateService } from "../biometrics/biometric-state.service";
|
|
import { Utils } from "../misc/utils";
|
|
|
|
export class SystemService implements SystemServiceAbstraction {
|
|
private reloadInterval: any = null;
|
|
private clearClipboardTimeout: any = null;
|
|
private clearClipboardTimeoutFunction: () => Promise<any> = null;
|
|
|
|
constructor(
|
|
private messagingService: MessagingService,
|
|
private platformUtilsService: PlatformUtilsService,
|
|
private reloadCallback: () => Promise<void> = null,
|
|
private stateService: StateService,
|
|
private autofillSettingsService: AutofillSettingsServiceAbstraction,
|
|
private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
|
|
private biometricStateService: BiometricStateService,
|
|
private accountService: AccountService,
|
|
) {}
|
|
|
|
async startProcessReload(authService: AuthService): Promise<void> {
|
|
const accounts = await firstValueFrom(this.accountService.accounts$);
|
|
if (accounts != null) {
|
|
const keys = Object.keys(accounts);
|
|
if (keys.length > 0) {
|
|
for (const userId of keys) {
|
|
let status = await firstValueFrom(authService.authStatusFor$(userId as UserId));
|
|
status = await authService.getAuthStatus(userId);
|
|
if (status === AuthenticationStatus.Unlocked) {
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// A reloadInterval has already been set and is executing
|
|
if (this.reloadInterval != null) {
|
|
return;
|
|
}
|
|
|
|
// User has set a PIN, with ask for master password on restart, to protect their vault
|
|
const ephemeralPin = await this.stateService.getPinKeyEncryptedUserKeyEphemeral();
|
|
if (ephemeralPin != null) {
|
|
return;
|
|
}
|
|
|
|
this.cancelProcessReload();
|
|
await this.executeProcessReload();
|
|
}
|
|
|
|
private async executeProcessReload() {
|
|
const biometricLockedFingerprintValidated = await firstValueFrom(
|
|
this.biometricStateService.fingerprintValidated$,
|
|
);
|
|
if (!biometricLockedFingerprintValidated) {
|
|
clearInterval(this.reloadInterval);
|
|
this.reloadInterval = null;
|
|
|
|
const currentUser = await firstValueFrom(
|
|
this.accountService.activeAccount$.pipe(
|
|
map((a) => a?.id),
|
|
timeout(500),
|
|
),
|
|
);
|
|
// Replace current active user if they will be logged out on reload
|
|
if (currentUser != null) {
|
|
const timeoutAction = await firstValueFrom(
|
|
this.vaultTimeoutSettingsService.vaultTimeoutAction$().pipe(timeout(500)),
|
|
);
|
|
if (timeoutAction === VaultTimeoutAction.LogOut) {
|
|
const nextUser = await firstValueFrom(
|
|
this.accountService.nextUpAccount$.pipe(map((account) => account?.id ?? null)),
|
|
);
|
|
// Can be removed once we migrate password generation history to state providers
|
|
await this.stateService.clearDecryptedData(currentUser);
|
|
await this.accountService.switchAccount(nextUser);
|
|
}
|
|
}
|
|
|
|
this.messagingService.send("reloadProcess");
|
|
if (this.reloadCallback != null) {
|
|
await this.reloadCallback();
|
|
}
|
|
return;
|
|
}
|
|
if (this.reloadInterval == null) {
|
|
this.reloadInterval = setInterval(async () => await this.executeProcessReload(), 1000);
|
|
}
|
|
}
|
|
|
|
cancelProcessReload(): void {
|
|
if (this.reloadInterval != null) {
|
|
clearInterval(this.reloadInterval);
|
|
this.reloadInterval = null;
|
|
}
|
|
}
|
|
|
|
async clearClipboard(clipboardValue: string, timeoutMs: number = null): Promise<void> {
|
|
if (this.clearClipboardTimeout != null) {
|
|
clearTimeout(this.clearClipboardTimeout);
|
|
this.clearClipboardTimeout = null;
|
|
}
|
|
|
|
if (Utils.isNullOrWhitespace(clipboardValue)) {
|
|
return;
|
|
}
|
|
|
|
const clearClipboardDelay = await firstValueFrom(
|
|
this.autofillSettingsService.clearClipboardDelay$,
|
|
);
|
|
|
|
if (clearClipboardDelay == null) {
|
|
return;
|
|
}
|
|
|
|
if (timeoutMs == null) {
|
|
timeoutMs = clearClipboardDelay * 1000;
|
|
}
|
|
|
|
this.clearClipboardTimeoutFunction = async () => {
|
|
const clipboardValueNow = await this.platformUtilsService.readFromClipboard();
|
|
if (clipboardValue === clipboardValueNow) {
|
|
this.platformUtilsService.copyToClipboard("", { clearing: true });
|
|
}
|
|
};
|
|
|
|
this.clearClipboardTimeout = setTimeout(async () => {
|
|
await this.clearPendingClipboard();
|
|
}, timeoutMs);
|
|
}
|
|
|
|
async clearPendingClipboard() {
|
|
if (this.clearClipboardTimeoutFunction != null) {
|
|
await this.clearClipboardTimeoutFunction();
|
|
this.clearClipboardTimeoutFunction = null;
|
|
}
|
|
}
|
|
}
|