From 6b286e9d9ea0b1453ad721e282a8780806be70d5 Mon Sep 17 00:00:00 2001 From: Cesar Gonzalez Date: Thu, 2 May 2024 11:39:48 -0500 Subject: [PATCH] [PM-7874] Fix lost state when adding a vault item on the current tab view (#9020) --- .../popup/services/popup-search.service.ts | 22 ------------------- .../src/popup/services/popup-utils.service.ts | 0 .../src/popup/services/services.module.ts | 7 ------ .../components/vault/current-tab.component.ts | 2 -- .../src/vault/abstractions/cipher.service.ts | 1 - .../src/vault/services/cipher.service.ts | 5 +---- 6 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 apps/browser/src/popup/services/popup-search.service.ts delete mode 100644 apps/browser/src/popup/services/popup-utils.service.ts diff --git a/apps/browser/src/popup/services/popup-search.service.ts b/apps/browser/src/popup/services/popup-search.service.ts deleted file mode 100644 index 40e6fd2d96..0000000000 --- a/apps/browser/src/popup/services/popup-search.service.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { StateProvider } from "@bitwarden/common/platform/state"; -import { SearchService } from "@bitwarden/common/services/search.service"; - -export class PopupSearchService extends SearchService { - constructor(logService: LogService, i18nService: I18nService, stateProvider: StateProvider) { - super(logService, i18nService, stateProvider); - } - - clearIndex(): Promise { - throw new Error("Not available."); - } - - indexCiphers(): Promise { - throw new Error("Not available."); - } - - async getIndexForSearch() { - return await super.getIndexForSearch(); - } -} diff --git a/apps/browser/src/popup/services/popup-utils.service.ts b/apps/browser/src/popup/services/popup-utils.service.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 36cbdf6292..ee08ed84b7 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -19,7 +19,6 @@ import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services. import { AuthRequestServiceAbstraction } from "@bitwarden/auth/common"; import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; -import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; @@ -125,7 +124,6 @@ import { VaultFilterService } from "../../vault/services/vault-filter.service"; import { DebounceNavigationService } from "./debounce-navigation.service"; import { InitService } from "./init.service"; import { PopupCloseWarningService } from "./popup-close-warning.service"; -import { PopupSearchService } from "./popup-search.service"; const OBSERVABLE_LARGE_OBJECT_MEMORY_STORAGE = new SafeInjectionToken< AbstractStorageService & ObservableStorageService @@ -182,11 +180,6 @@ const safeProviders: SafeProvider[] = [ useFactory: getBgService("ssoLoginService"), deps: [], }), - safeProvider({ - provide: SearchServiceAbstraction, - useClass: PopupSearchService, - deps: [LogService, I18nServiceAbstraction, StateProvider], - }), safeProvider({ provide: CryptoFunctionService, useFactory: () => new WebCryptoFunctionService(window), diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts index d882dfd525..4d2674fd70 100644 --- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts +++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts @@ -292,8 +292,6 @@ export class CurrentTabComponent implements OnInit, OnDestroy { const ciphers = await this.cipherService.getAllDecryptedForUrl( this.url, otherTypes.length > 0 ? otherTypes : null, - null, - false, ); this.loginCiphers = []; diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts index 4337043cdf..22e2c54a59 100644 --- a/libs/common/src/vault/abstractions/cipher.service.ts +++ b/libs/common/src/vault/abstractions/cipher.service.ts @@ -33,7 +33,6 @@ export abstract class CipherService { url: string, includeOtherTypes?: CipherType[], defaultMatch?: UriMatchStrategySetting, - reindexCiphers?: boolean, ) => Promise; getAllFromApiForOrganization: (organizationId: string) => Promise; /** diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts index fd484ee902..174da701bd 100644 --- a/libs/common/src/vault/services/cipher.service.ts +++ b/libs/common/src/vault/services/cipher.service.ts @@ -441,7 +441,6 @@ export class CipherService implements CipherServiceAbstraction { url: string, includeOtherTypes?: CipherType[], defaultMatch: UriMatchStrategySetting = null, - reindexCiphers = true, ): Promise { if (url == null && includeOtherTypes == null) { return Promise.resolve([]); @@ -450,9 +449,7 @@ export class CipherService implements CipherServiceAbstraction { const equivalentDomains = await firstValueFrom( this.domainSettingsService.getUrlEquivalentDomains(url), ); - const ciphers = reindexCiphers - ? await this.getAllDecrypted() - : await this.getDecryptedCiphers(); + const ciphers = await this.getAllDecrypted(); defaultMatch ??= await firstValueFrom(this.domainSettingsService.defaultUriMatchStrategy$); return ciphers.filter((cipher) => {