devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

PM-7392 - More replacements of expired with logoutReason

This commit is contained in:
Jared Snider 2024-05-08 17:25:57 -04:00
parent 18d84bd429
commit 7aae92e78e
No known key found for this signature in database
GPG Key ID: A149DDD612516286
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/browser/src/background/service-factories/vault-timeout-service.factory.ts
View File

@ -1,3 +1,4 @@
import { LogoutReason } from "@bitwarden/auth/common";
import { VaultTimeoutService as AbstractVaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service";
import {
@ -56,7 +57,7 @@ import {
type VaultTimeoutServiceFactoryOptions = FactoryOptions & {
vaultTimeoutServiceOptions: {
lockedCallback: (userId?: string) => Promise<void>;
loggedOutCallback: (expired: boolean, userId?: string) => Promise<void>;
loggedOutCallback: (logoutReason: LogoutReason, userId?: string) => Promise<void>;
};
};

3
apps/cli/src/platform/services/node-api.service.ts
View File

@ -2,6 +2,7 @@ import * as FormData from "form-data";
import { HttpsProxyAgent } from "https-proxy-agent";
import * as fe from "node-fetch";
import { LogoutReason } from "@bitwarden/auth/common";
import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@ -25,7 +26,7 @@ export class NodeApiService extends ApiService {
stateService: StateService,
refreshAccessTokenErrorCallback: () => Promise<void>,
logService: LogService,
logoutCallback: (expired: boolean) => Promise<void>,
logoutCallback: (logoutReason: LogoutReason) => Promise<void>,
customUserAgent: string = null,
) {
super(

6
libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts
View File

@ -1,6 +1,8 @@
import { MockProxy, any, mock } from "jest-mock-extended";
import { BehaviorSubject, from, of } from "rxjs";
import { LogoutReason } from "@bitwarden/auth/common";
import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
import { SearchService } from "../../abstractions/search.service";
import { VaultTimeoutSettingsService } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
@ -35,7 +37,7 @@ describe("VaultTimeoutService", () => {
let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
let stateEventRunnerService: MockProxy<StateEventRunnerService>;
let lockedCallback: jest.Mock<Promise<void>, [userId: string]>;
let loggedOutCallback: jest.Mock<Promise<void>, [expired: boolean, userId?: string]>;
let loggedOutCallback: jest.Mock<Promise<void>, [logoutReason: LogoutReason, userId?: string]>;
let vaultTimeoutActionSubject: BehaviorSubject<VaultTimeoutAction>;
let availableVaultTimeoutActionsSubject: BehaviorSubject<VaultTimeoutAction[]>;
@ -187,7 +189,7 @@ describe("VaultTimeoutService", () => {
};
const expectUserToHaveLoggedOut = (userId: string) => {
expect(loggedOutCallback).toHaveBeenCalledWith(false, userId);
expect(loggedOutCallback).toHaveBeenCalledWith("vaultTimeout", userId);
};
const expectNoAction = (userId: string) => {