[PM-31409] Remove unreachable error handling and use userId for creation date

Drop the dead catchError/LogService paths from the nudge services and read
the creation date for the provided userId instead of the active account.
This commit is contained in:
Aaron Jordan
2026-11-13 12:16:35 -08:00
parent f088641cd4
commit 74d918095c
2 changed files with 9 additions and 10 deletions

View File

@@ -938,7 +938,7 @@ const safeProviders: SafeProvider[] = [
safeProvider({
provide: AUTOFILL_NUDGE_SERVICE as SafeInjectionToken<BrowserAutofillNudgeService>,
useClass: BrowserAutofillNudgeService,
deps: [StateProvider, AccountService, LogService],
deps: [StateProvider, AccountService],
}),
safeProvider({
provide: AUTO_CONFIRM_NUDGE_SERVICE as SafeInjectionToken<AutoConfirmNudgeService>,

View File

@@ -3,7 +3,7 @@ import { mock } from "jest-mock-extended";
import { BehaviorSubject, firstValueFrom } from "rxjs";
import { NudgeStatus, NudgeType } from "@bitwarden/angular/vault";
import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { BrowserClientVendors } from "@bitwarden/common/autofill/constants";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { StateProvider } from "@bitwarden/common/platform/state";
@@ -16,7 +16,7 @@ import { BrowserAutofillNudgeService } from "./browser-autofill-nudge.service";
describe("BrowserAutofillNudgeService", () => {
let service: BrowserAutofillNudgeService;
let activeAccount$: BehaviorSubject<Account | null>;
let accounts$: BehaviorSubject<Record<UserId, AccountInfo>>;
let fakeStateProvider: FakeStateProvider;
const userId = "test-user-id" as UserId;
@@ -36,10 +36,9 @@ describe("BrowserAutofillNudgeService", () => {
const recentProfileDate = new Date();
beforeEach(() => {
activeAccount$ = new BehaviorSubject<Account | null>({
id: userId,
creationDate: recentProfileDate,
} as Account);
accounts$ = new BehaviorSubject<Record<UserId, AccountInfo>>({
[userId]: { creationDate: recentProfileDate } as AccountInfo,
});
fakeStateProvider = new FakeStateProvider(mockAccountServiceWith(userId));
@@ -48,7 +47,7 @@ describe("BrowserAutofillNudgeService", () => {
BrowserAutofillNudgeService,
{
provide: AccountService,
useValue: { activeAccount$ },
useValue: { accounts$ },
},
{
provide: StateProvider,
@@ -101,7 +100,7 @@ describe("BrowserAutofillNudgeService", () => {
it("preserves parent dismissed status when account is older than 30 days", async () => {
// Set profile creation date to more than 30 days ago
const oldProfileDate = new Date(Date.now() - 31 * 24 * 60 * 60 * 1000);
activeAccount$.next({ id: userId, creationDate: oldProfileDate } as Account);
accounts$.next({ [userId]: { creationDate: oldProfileDate } as AccountInfo });
jest.spyOn(BrowserApi, "getBrowserClientVendor").mockReturnValue(BrowserClientVendors.Chrome);
jest.spyOn(BrowserApi, "browserAutofillSettingsOverridden").mockResolvedValue(false);
@@ -114,7 +113,7 @@ describe("BrowserAutofillNudgeService", () => {
it("combines parent dismissed and browser autofill overridden status", async () => {
// Set profile creation date to more than 30 days ago (parent dismisses)
const oldProfileDate = new Date(Date.now() - 31 * 24 * 60 * 60 * 1000);
activeAccount$.next({ id: userId, creationDate: oldProfileDate } as Account);
accounts$.next({ [userId]: { creationDate: oldProfileDate } as AccountInfo });
jest.spyOn(BrowserApi, "getBrowserClientVendor").mockReturnValue(BrowserClientVendors.Chrome);
jest.spyOn(BrowserApi, "browserAutofillSettingsOverridden").mockResolvedValue(true);