From 2382d5028bccaf8a87d4069e4b0c1a0c41ead179 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 18 Jul 2018 10:10:45 -0400
Subject: [PATCH] passbolt csv import

---
 src/app/tools/import.component.html | 5 +++++
 src/app/tools/import.component.ts   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 22dd72f631..e84fd23f34 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -113,6 +113,11 @@
             "Export" button to save the CSV file. Note: RoboForm only allows you to export Logins. Other items will not be
             exported.
         </ng-container>
+        <ng-container *ngIf="format === 'passboltcsv'">
+            Log into the Passbolt web vault and navigate to the "Passwords" listing. Select all of the passwords you would like to export
+            and click the "Export" button at the top of the listing. Choose the "csv (lastpass)" export format and click
+            the "Export" button.
+        </ng-container>
     </app-callout>
     <div class="row">
         <div class="col-6">
diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts
index 82f2de3ed4..7995a8b2a9 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -206,6 +206,7 @@ export class ImportComponent implements OnInit {
             { id: 'splashidcsv', name: 'SplashID (csv)' },
             { id: 'passworddragonxml', name: 'Password Dragon (xml)' },
             { id: 'padlockcsv', name: 'Padlock (csv)' },
+            { id: 'passboltcsv', name: 'Passbolt (csv)' },
             { id: 'clipperzhtml', name: 'Clipperz (html)' },
             { id: 'aviracsv', name: 'Avira (csv)' },
             { id: 'saferpasscsv', name: 'SaferPass (csv)' },
@@ -229,6 +230,7 @@ export class ImportComponent implements OnInit {
             case 'bitwardencsv':
                 return new BitwardenCsvImporter();
             case 'lastpasscsv':
+            case 'passboltcsv':
                 return new LastPassCsvImporter();
             case 'keepassxcsv':
                 return new KeePassXCsvImporter();