Update paste icons and throw error on wrong import

apps/desktop/src/vault/app/vault/add-edit.component.html

@@ -512,6 +512,15 @@ <h2 class="box-header">
                     [ngClass]="{ 'bwi-eye': !showPrivateKey, 'bwi-eye-slash': showPrivateKey }"
                   ></i>
                 </button>
+                <button
+                  type="button"
+                  class="row-btn"
+                  appStopClick
+                  appA11yTitle="{{ 'importSshKeyFromClipboard' | i18n }}"
+                  (click)="importSshKeyFromClipboard()"
+                >
+                  <i class="bwi bwi-lg bwi-paste" aria-hidden="true"></i>
+                </button>
               </div>
             </div>
             <div class="box-content-row box-content-row-flex" appBoxRow>
@@ -559,16 +568,6 @@ <h2 class="box-header">
                 </button>
               </div>
             </div>
-            <div class="box-content-row box-content-row-flex" appBoxRow>
-              <button
-                type="button"
-                class="row-btn"
-                appStopClick
-                (click)="importSshKeyFromClipboard()"
-              >
-                {{ "importSshKeyFromClipboard" | i18n }}
-              </button>
-            </div>
           </div>
         </div>
       </div>

apps/web/src/locales/en/messages.json

@@ -10194,6 +10194,9 @@
   "sshKeyPasted": {
     "message": "SSH key imported successfully"
   },
+  "copySSHPrivateKey": {
+    "message": "Copy private key"
+  },
   "resellerRenewalWarningMsg": {
     "message": "Your subscription will renew soon. To ensure uninterrupted service, contact $RESELLER$ to confirm your renewal before $RENEWAL_DATE$.",
     "placeholders": {

libs/angular/src/services/jslib-services.module.ts

@@ -836,6 +836,7 @@ const safeProviders: SafeProvider[] = [
       EncryptService,
       PinServiceAbstraction,
       AccountServiceAbstraction,
+      SdkService,
     ],
   }),
   safeProvider({

libs/common/src/enums/feature-flag.enum.ts

@@ -86,7 +86,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.IdpAutoSubmitLogin]: FALSE,
   [FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE,
   [FeatureFlag.AccountDeprovisioning]: FALSE,
-  [FeatureFlag.SSHKeyVaultItem]: FALSE,
+  [FeatureFlag.SSHKeyVaultItem]: true,
   [FeatureFlag.SSHAgent]: FALSE,
   [FeatureFlag.AC2476_DeprecateStripeSourcesAPI]: FALSE,
   [FeatureFlag.CipherKeyEncryption]: FALSE,

libs/common/src/models/export/ssh-key.export.ts

@@ -18,9 +18,10 @@ export class SshKeyExport {
   }
 
   static toView(req: SshKeyExport, view = new SshKeyView()) {
-    view.privateKey = req.privateKey;
-    view.publicKey = req.publicKey;
-    view.keyFingerprint = req.keyFingerprint;
+    const parsedKey = import_ssh_key(req.privateKey);
+    view.privateKey = parsedKey.private_key;
+    view.publicKey = parsedKey.public_key;
+    view.keyFingerprint = parsedKey.key_fingerprint;
     return view;
   }
 

libs/importer/src/components/import.component.ts

@@ -33,6 +33,7 @@ import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
@@ -92,6 +93,7 @@ const safeProviders: SafeProvider[] = [
       EncryptService,
       PinServiceAbstraction,
       AccountService,
+      SdkService,
     ],
   }),
 ];

libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts

@@ -12,6 +12,7 @@ import {
 } from "@bitwarden/common/models/export";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { OrganizationId } from "@bitwarden/common/types/guid";
@@ -40,11 +41,15 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
     protected cipherService: CipherService,
     protected pinService: PinServiceAbstraction,
     protected accountService: AccountService,
+    protected sdkService: SdkService,
   ) {
     super();
   }
 
   async parse(data: string): Promise<ImportResult> {
+    // parsing ssh keys needs an sdk initialized
+    await firstValueFrom(this.sdkService.client$);
+
     this.result = new ImportResult();
     const results: BitwardenJsonExport = JSON.parse(data);
     if (results == null || results.items == null) {

libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts

@@ -4,6 +4,7 @@ import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -31,9 +32,18 @@ export class BitwardenPasswordProtectedImporter extends BitwardenJsonImporter im
     cipherService: CipherService,
     pinService: PinServiceAbstraction,
     accountService: AccountService,
+    sdkService: SdkService,
     private promptForPassword_callback: () => Promise<string>,
   ) {
-    super(keyService, encryptService, i18nService, cipherService, pinService, accountService);
+    super(
+      keyService,
+      encryptService,
+      i18nService,
+      cipherService,
+      pinService,
+      accountService,
+      sdkService,
+    );
   }
 
   async parse(data: string): Promise<ImportResult> {

libs/importer/src/services/import.service.spec.ts

@@ -5,6 +5,7 @@ import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
@@ -30,6 +31,7 @@ describe("ImportService", () => {
   let encryptService: MockProxy<EncryptService>;
   let pinService: MockProxy<PinServiceAbstraction>;
   let accountService: MockProxy<AccountService>;
+  let sdkService: MockProxy<SdkService>;
 
   beforeEach(() => {
     cipherService = mock<CipherService>();
@@ -40,6 +42,7 @@ describe("ImportService", () => {
     keyService = mock<KeyService>();
     encryptService = mock<EncryptService>();
     pinService = mock<PinServiceAbstraction>();
+    sdkService = mock<SdkService>();
 
     importService = new ImportService(
       cipherService,
@@ -51,6 +54,7 @@ describe("ImportService", () => {
       encryptService,
       pinService,
       accountService,
+      sdkService,
     );
   });
 

libs/importer/src/services/import.service.ts

@@ -15,6 +15,7 @@ import { KvpRequest } from "@bitwarden/common/models/request/kvp.request";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
@@ -114,6 +115,7 @@ export class ImportService implements ImportServiceAbstraction {
     private encryptService: EncryptService,
     private pinService: PinServiceAbstraction,
     private accountService: AccountService,
+    private sdkService: SdkService,
   ) {}
 
   getImportOptions(): ImportOption[] {
@@ -220,6 +222,7 @@ export class ImportService implements ImportServiceAbstraction {
           this.cipherService,
           this.pinService,
           this.accountService,
+          this.sdkService,
           promptForPassword_callback,
         );
       case "lastpasscsv":

libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html

@@ -17,7 +17,7 @@ <h2 bitTypography="h6">
       ></button>
       <button
         type="button"
-        bitIconButton="bwi-clone"
+        bitIconButton="bwi-paste"
         bitSuffix
         data-testid="import-privateKey"
         (click)="importSshKeyFromClipboard()"