Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-27 22:11:38 +01:00
Code Issues Projects Releases Wiki Activity

fix broken blockedInteractionsUris state contruction (#12813)

Browse Source
This commit is contained in:
Jonathan Prusik 2025-01-13 09:01:16 -05:00 committed by GitHub
parent 22f4822efc
commit fb4d7e8f05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/browser/src/platform/services/browser-script-injector.service.spec.ts
View File

@ -63,7 +63,7 @@ describe("ScriptInjectorService", () => {
configService.getFeatureFlag$.mockImplementation(() => of(false)); configService.getFeatureFlag$.mockImplementation(() => of(false));
domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService); domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains); domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
domainSettingsService.blockedInteractionsUris$ = of(null); domainSettingsService.blockedInteractionsUris$ = of({});
scriptInjectorService = new BrowserScriptInjectorService( scriptInjectorService = new BrowserScriptInjectorService(
domainSettingsService, domainSettingsService,
platformUtilsService, platformUtilsService,

2
apps/browser/src/tools/background/fileless-importer.background.spec.ts
View File

@ -39,7 +39,7 @@ describe("FilelessImporterBackground ", () => {
let tabMock: chrome.tabs.Tab; let tabMock: chrome.tabs.Tab;
beforeEach(() => { beforeEach(() => {
domainSettingsService.blockedInteractionsUris$ = of(null); domainSettingsService.blockedInteractionsUris$ = of({});
policyService.policyAppliesToActiveUser$.mockImplementation(() => of(true)); policyService.policyAppliesToActiveUser$.mockImplementation(() => of(true));
scriptInjectorService = new BrowserScriptInjectorService( scriptInjectorService = new BrowserScriptInjectorService(
domainSettingsService, domainSettingsService,

2
libs/common/src/autofill/services/domain-settings.service.spec.ts
View File

@ -29,7 +29,7 @@ describe("DefaultDomainSettingsService", () => {
jest.spyOn(domainSettingsService, "getUrlEquivalentDomains"); jest.spyOn(domainSettingsService, "getUrlEquivalentDomains");
domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains); domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
domainSettingsService.blockedInteractionsUris$ = of(null); domainSettingsService.blockedInteractionsUris$ = of({});
}); });
describe("getUrlEquivalentDomains", () => { describe("getUrlEquivalentDomains", () => {

4
libs/common/src/autofill/services/domain-settings.service.ts
View File

@ -36,7 +36,7 @@ const BLOCKED_INTERACTIONS_URIS = new KeyDefinition(
DOMAIN_SETTINGS_DISK, DOMAIN_SETTINGS_DISK,
"blockedInteractionsUris", "blockedInteractionsUris",
{ {
deserializer: (value: NeverDomains) => value ?? null, deserializer: (value: NeverDomains) => value ?? {},
}, },
); );
@ -131,7 +131,7 @@ export class DefaultDomainSettingsService implements DomainSettingsService {
switchMap((featureIsEnabled) => switchMap((featureIsEnabled) =>
featureIsEnabled ? this.blockedInteractionsUrisState.state$ : of({} as NeverDomains), featureIsEnabled ? this.blockedInteractionsUrisState.state$ : of({} as NeverDomains),
), ),
map((disabledUris) => (Object.keys(disabledUris).length ? disabledUris : null)), map((disabledUris) => (Object.keys(disabledUris).length ? disabledUris : {})),
); );
this.equivalentDomainsState = this.stateProvider.getActive(EQUIVALENT_DOMAINS); this.equivalentDomainsState = this.stateProvider.getActive(EQUIVALENT_DOMAINS);