From a6b5845d65107a265b5e9de65d6cec093312a5d7 Mon Sep 17 00:00:00 2001 From: Jeffrey Holland Date: Thu, 13 Mar 2025 20:22:20 +0100 Subject: [PATCH] Fix import issues --- apps/desktop/resources/entitlements.mas.inherit.plist | 2 -- apps/desktop/resources/entitlements.mas.plist | 2 -- .../src/autofill/services/desktop-autofill.service.ts | 5 ++--- .../src/modal/passkeys/create/fido2-create.component.ts | 9 +++++++-- apps/desktop/src/modal/passkeys/fido2-vault.component.ts | 7 ++++++- apps/desktop/src/utils.ts | 6 +----- libs/components/src/icon-button/index.ts | 1 + 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/apps/desktop/resources/entitlements.mas.inherit.plist b/apps/desktop/resources/entitlements.mas.inherit.plist index 7e957fce7ce..e9a28f8f327 100644 --- a/apps/desktop/resources/entitlements.mas.inherit.plist +++ b/apps/desktop/resources/entitlements.mas.inherit.plist @@ -8,9 +8,7 @@ com.apple.security.cs.allow-jit - diff --git a/apps/desktop/resources/entitlements.mas.plist b/apps/desktop/resources/entitlements.mas.plist index bb06ae10431..8bca39937d6 100644 --- a/apps/desktop/resources/entitlements.mas.plist +++ b/apps/desktop/resources/entitlements.mas.plist @@ -18,10 +18,8 @@ com.apple.security.device.usb - com.apple.security.temporary-exception.files.home-relative-path.read-write /Library/Application Support/Mozilla/NativeMessagingHosts/ diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts index e88e16c2ffc..22ba64d4d76 100644 --- a/apps/desktop/src/autofill/services/desktop-autofill.service.ts +++ b/apps/desktop/src/autofill/services/desktop-autofill.service.ts @@ -9,7 +9,6 @@ import { mergeMap, switchMap, takeUntil, - EMPTY, } from "rxjs"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -61,9 +60,9 @@ export class DesktopAutofillService implements OnDestroy { .pipe( distinctUntilChanged(), switchMap((enabled) => { - if (!enabled) { + /* if (!enabled) { return EMPTY; - } + } */ return this.accountService.activeAccount$.pipe( map((account) => account?.id), diff --git a/apps/desktop/src/modal/passkeys/create/fido2-create.component.ts b/apps/desktop/src/modal/passkeys/create/fido2-create.component.ts index 0ac78e1c476..49965e368a8 100644 --- a/apps/desktop/src/modal/passkeys/create/fido2-create.component.ts +++ b/apps/desktop/src/modal/passkeys/create/fido2-create.component.ts @@ -4,6 +4,7 @@ import { RouterModule, Router } from "@angular/router"; import { BehaviorSubject, firstValueFrom, map, Observable } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { BitwardenShield } from "@bitwarden/auth/angular"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -16,9 +17,10 @@ import { ItemModule, SectionComponent, TableModule, -} from "@bitwarden/components"; - + SectionHeaderComponent } from "@bitwarden/components"; // import { SearchComponent } from "@bitwarden/components/src/search/search.component"; +import { BitIconButtonComponent } from "@bitwarden/components"; + import { DesktopFido2UserInterfaceService, DesktopFido2UserInterfaceSession, @@ -31,6 +33,8 @@ import { DesktopSettingsService } from "../../../platform/services/desktop-setti imports: [ CommonModule, RouterModule, + SectionHeaderComponent, + BitIconButtonComponent, TableModule, JslibModule, IconModule, @@ -47,6 +51,7 @@ export class Fido2CreateComponent implements OnInit { session?: DesktopFido2UserInterfaceSession = null; private ciphersSubject = new BehaviorSubject([]); ciphers$: Observable = this.ciphersSubject.asObservable(); + readonly Icons = { BitwardenShield }; constructor( private readonly desktopSettingsService: DesktopSettingsService, diff --git a/apps/desktop/src/modal/passkeys/fido2-vault.component.ts b/apps/desktop/src/modal/passkeys/fido2-vault.component.ts index e59b56fb8fe..0b32377d302 100644 --- a/apps/desktop/src/modal/passkeys/fido2-vault.component.ts +++ b/apps/desktop/src/modal/passkeys/fido2-vault.component.ts @@ -4,6 +4,7 @@ import { RouterModule, Router } from "@angular/router"; import { firstValueFrom, map, BehaviorSubject, Observable } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { BitwardenShield } from "@bitwarden/auth/angular"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @@ -15,7 +16,8 @@ import { ItemModule, SectionComponent, TableModule, -} from "@bitwarden/components"; + BitIconButtonComponent, SectionHeaderComponent } from "@bitwarden/components"; + import { DesktopFido2UserInterfaceService, @@ -28,6 +30,8 @@ import { DesktopSettingsService } from "../../platform/services/desktop-settings imports: [ CommonModule, RouterModule, + SectionHeaderComponent, + BitIconButtonComponent, TableModule, JslibModule, IconModule, @@ -45,6 +49,7 @@ export class Fido2VaultComponent implements OnInit, OnDestroy { ciphers$: Observable = this.ciphersSubject.asObservable(); private cipherIdsSubject = new BehaviorSubject([]); cipherIds$: Observable; + readonly Icons = { BitwardenShield }; constructor( private readonly desktopSettingsService: DesktopSettingsService, diff --git a/apps/desktop/src/utils.ts b/apps/desktop/src/utils.ts index c798faac36e..d203998ed4d 100644 --- a/apps/desktop/src/utils.ts +++ b/apps/desktop/src/utils.ts @@ -20,11 +20,7 @@ export function invokeMenu(menu: RendererMenuItem[]) { } export function isDev() { - // ref: https://github.com/sindresorhus/electron-is-dev - if ("ELECTRON_IS_DEV" in process.env) { - return parseInt(process.env.ELECTRON_IS_DEV, 10) === 1; - } - return process.defaultApp || /node_modules[\\/]electron[\\/]/.test(process.execPath); + return true; } export function isLinux() { diff --git a/libs/components/src/icon-button/index.ts b/libs/components/src/icon-button/index.ts index 9da4a3162bf..b753e53c96a 100644 --- a/libs/components/src/icon-button/index.ts +++ b/libs/components/src/icon-button/index.ts @@ -1 +1,2 @@ export * from "./icon-button.module"; +export * from "./icon-button.component";