From 0d5e4c6f581968cdfeaf700cc925d89a1ee2d071 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 9 Jan 2025 00:24:23 +0100 Subject: [PATCH] [PM-16859] Fix item creation resetting to login item type on browser (#12765) * Fix broken item creation on browser * Fix creation of ssh keys items from a filtered vault resetting to login on web --- .../new-item-dropdown/new-item-dropdown-v2.component.ts | 2 +- .../src/app/vault/individual-vault/add-edit.component.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts index be30b29fb18..d57b1d2fe36 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts +++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts @@ -50,7 +50,7 @@ export class NewItemDropdownV2Component implements OnInit { this.tab = await BrowserApi.getTabFromCurrentWindow(); } - async buildQueryParams(type: CipherType): Promise { + buildQueryParams(type: CipherType): AddEditQueryParams { const poppedOut = BrowserPopupUtils.inPopout(window); const loginDetails: { uri?: string; name?: string } = {}; diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts index 64118e47ee8..56db7dc88da 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts @@ -107,7 +107,11 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On // https://bitwarden.atlassian.net/browse/PM-10413 // cannot generate ssh keys so block creation - if (this.type === CipherType.SshKey && this.cipherId == null) { + if ( + this.type === CipherType.SshKey && + this.cipherId == null && + !(await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem)) + ) { this.type = CipherType.Login; this.cipher.type = CipherType.Login; }