From 40ce33d6b7b74fb93c4dd3abdeaf00feeb3be2a1 Mon Sep 17 00:00:00 2001 From: Jeffrey Holland Date: Tue, 9 Sep 2025 21:44:11 +0200 Subject: [PATCH] Fixes for broken build --- apps/desktop/desktop_native/napi/index.d.ts | 4 +- .../credentials/bitwarden-shield.icon.ts | 7 --- .../credentials/fido2-create.component.html | 2 +- .../credentials/fido2-create.component.ts | 7 +-- .../fido2-excluded-ciphers.component.html | 2 +- .../fido2-excluded-ciphers.component.ts | 7 +-- .../credentials/fido2-passkey-exists-icon.ts | 48 +++++++++---------- .../credentials/fido2-vault.component.ts | 5 +- 8 files changed, 34 insertions(+), 48 deletions(-) delete mode 100644 apps/desktop/src/autofill/modal/credentials/bitwarden-shield.icon.ts diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts index a64fae4f804..3f34b7ba4f4 100644 --- a/apps/desktop/desktop_native/napi/index.d.ts +++ b/apps/desktop/desktop_native/napi/index.d.ts @@ -233,8 +233,8 @@ export declare namespace chromium_importer { login?: Login failure?: LoginImportFailure } - export function getInstalledBrowsers(): Promise> - export function getAvailableProfiles(browser: string): Promise> + export function getInstalledBrowsers(): Array + export function getAvailableProfiles(browser: string): Array export function importLogins(browser: string, profileId: string): Promise> } export declare namespace autotype { diff --git a/apps/desktop/src/autofill/modal/credentials/bitwarden-shield.icon.ts b/apps/desktop/src/autofill/modal/credentials/bitwarden-shield.icon.ts deleted file mode 100644 index 86e3a0bb1b2..00000000000 --- a/apps/desktop/src/autofill/modal/credentials/bitwarden-shield.icon.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { svgIcon } from "@bitwarden/components"; - -export const BitwardenShield = svgIcon` - - - -`; diff --git a/apps/desktop/src/autofill/modal/credentials/fido2-create.component.html b/apps/desktop/src/autofill/modal/credentials/fido2-create.component.html index 022088feb8d..67fc76aa317 100644 --- a/apps/desktop/src/autofill/modal/credentials/fido2-create.component.html +++ b/apps/desktop/src/autofill/modal/credentials/fido2-create.component.html @@ -28,7 +28,7 @@
- +
{{ "noMatchingLoginsForSite" | i18n }}
diff --git a/apps/desktop/src/autofill/modal/credentials/fido2-create.component.ts b/apps/desktop/src/autofill/modal/credentials/fido2-create.component.ts index 14d31cca99e..9edea2764e0 100644 --- a/apps/desktop/src/autofill/modal/credentials/fido2-create.component.ts +++ b/apps/desktop/src/autofill/modal/credentials/fido2-create.component.ts @@ -4,6 +4,7 @@ import { RouterModule, Router } from "@angular/router"; import { combineLatest, map, Observable, switchMap } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { BitwardenShield, NoResults } from "@bitwarden/assets/svg"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service"; import { Fido2Utils } from "@bitwarden/common/platform/services/fido2/fido2-utils"; @@ -32,9 +33,6 @@ import { DesktopFido2UserInterfaceSession, } from "../../services/desktop-fido2-user-interface.service"; -import { BitwardenShield } from "./bitwarden-shield.icon"; -import { Fido2PasskeyExistsIcon } from "./fido2-passkey-exists-icon"; - @Component({ standalone: true, imports: [ @@ -56,8 +54,7 @@ import { Fido2PasskeyExistsIcon } from "./fido2-passkey-exists-icon"; export class Fido2CreateComponent implements OnInit, OnDestroy { session?: DesktopFido2UserInterfaceSession = null; ciphers$: Observable; - readonly Icons = { BitwardenShield }; - protected fido2PasskeyExistsIcon = Fido2PasskeyExistsIcon; + readonly Icons = { BitwardenShield, NoResults }; private get DIALOG_MESSAGES() { return { diff --git a/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.html b/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.html index f438f1035cc..792934deedc 100644 --- a/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.html +++ b/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.html @@ -30,7 +30,7 @@ class="tw-flex tw-bg-background-alt tw-flex-col tw-justify-start tw-items-center tw-gap-2 tw-h-full tw-px-5" >
- +
{{ "passkeyAlreadyExists" | i18n }} {{ "applicationDoesNotSupportDuplicates" | i18n }} diff --git a/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.ts b/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.ts index 450e2dc186b..ddcf95d7d08 100644 --- a/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.ts +++ b/apps/desktop/src/autofill/modal/credentials/fido2-excluded-ciphers.component.ts @@ -3,6 +3,7 @@ import { Component, OnInit, OnDestroy } from "@angular/core"; import { RouterModule, Router } from "@angular/router"; import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { BitwardenShield, NoResults } from "@bitwarden/assets/svg"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BadgeModule, @@ -22,9 +23,6 @@ import { DesktopFido2UserInterfaceSession, } from "../../services/desktop-fido2-user-interface.service"; -import { BitwardenShield } from "./bitwarden-shield.icon"; -import { Fido2PasskeyExistsIcon } from "./fido2-passkey-exists-icon"; - @Component({ standalone: true, imports: [ @@ -45,8 +43,7 @@ import { Fido2PasskeyExistsIcon } from "./fido2-passkey-exists-icon"; }) export class Fido2ExcludedCiphersComponent implements OnInit, OnDestroy { session?: DesktopFido2UserInterfaceSession = null; - readonly Icons = { BitwardenShield }; - protected fido2PasskeyExistsIcon = Fido2PasskeyExistsIcon; + readonly Icons = { BitwardenShield, NoResults }; constructor( private readonly desktopSettingsService: DesktopSettingsService, diff --git a/apps/desktop/src/autofill/modal/credentials/fido2-passkey-exists-icon.ts b/apps/desktop/src/autofill/modal/credentials/fido2-passkey-exists-icon.ts index 66c3ebe0f5b..c32674cd1d0 100644 --- a/apps/desktop/src/autofill/modal/credentials/fido2-passkey-exists-icon.ts +++ b/apps/desktop/src/autofill/modal/credentials/fido2-passkey-exists-icon.ts @@ -1,24 +1,24 @@ -import { svgIcon } from "@bitwarden/components"; - -export const Fido2PasskeyExistsIcon = svgIcon` - - - - - - - - - - - - -`; +// import { svgIcon } from "@bitwarden/components"; +// +// export const Fido2PasskeyExistsIcon = svgIcon` +// +// +// +// +// +// +// +// +// +// +// +// +// `; diff --git a/apps/desktop/src/autofill/modal/credentials/fido2-vault.component.ts b/apps/desktop/src/autofill/modal/credentials/fido2-vault.component.ts index a88a65b39fd..da1f1de57ba 100644 --- a/apps/desktop/src/autofill/modal/credentials/fido2-vault.component.ts +++ b/apps/desktop/src/autofill/modal/credentials/fido2-vault.component.ts @@ -13,6 +13,7 @@ import { } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { BitwardenShield } from "@bitwarden/assets/svg"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -38,8 +39,6 @@ import { DesktopFido2UserInterfaceSession, } from "../../services/desktop-fido2-user-interface.service"; -import { BitwardenShield } from "./bitwarden-shield.icon"; - @Component({ standalone: true, imports: [ @@ -138,7 +137,7 @@ export class Fido2VaultComponent implements OnInit, OnDestroy { // If specific IDs provided, filter by them if (cipherIds?.length > 0) { - return activeCiphers.filter((cipher) => cipherIds.includes(cipher.id)); + return activeCiphers.filter((cipher) => cipherIds.includes(cipher.id as string)); } return activeCiphers;