From 898137c8a50e5aeb7553c8f6cf9a547809cb5c0a Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 19 Jul 2018 08:05:53 -0400
Subject: [PATCH] password boss importer

---
 jslib                               | 2 +-
 src/app/tools/import.component.html | 4 ++++
 src/app/tools/import.component.ts   | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jslib b/jslib
index 4b5e192457..4750a64ece 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 4b5e192457efd2ca6f364274a395bc21ce172c70
+Subproject commit 4750a64ece77a53c36b2cca97a759e0598a4873c
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 7e81a5b178..8d2b358d17 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -122,6 +122,10 @@
             Using the Ascendo DataVault desktop application, navigate to "Tools" &rarr; "Export". In the dialog that pops up, select
             the "All Items (DVX, CSV)" option. Click the "Ok" button to save the CSV file.
         </ng-container>
+        <ng-container *ngIf="format === 'passwordbossjson'">
+            Using the Password Boss desktop application, navigate to "File" &rarr; "Export data" &rarr; "Password Boss JSON - not encrypted"
+            and save the JSON file.
+        </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 e61d47da88..e7cbd8619d 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -40,6 +40,7 @@ import { MSecureCsvImporter } from 'jslib/importers/msecureCsvImporter';
 import { OnePassword1PifImporter } from 'jslib/importers/onepassword1PifImporter';
 import { OnePasswordWinCsvImporter } from 'jslib/importers/onepasswordWinCsvImporter';
 import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
+import { PasswordBossJsonImporter } from 'jslib/importers/passwordBossJsonImporter';
 import { PasswordDragonXmlImporter } from 'jslib/importers/passwordDragonXmlImporter';
 import { PasswordSafeXmlImporter } from 'jslib/importers/passwordSafeXmlImporter';
 import { RoboFormCsvImporter } from 'jslib/importers/roboformCsvImporter';
@@ -283,6 +284,8 @@ export class ImportComponent implements OnInit {
                 return new RoboFormCsvImporter();
             case 'ascendocsv':
                 return new AscendoCsvImporter();
+            case 'passwordbossjson':
+                return new PasswordBossJsonImporter();
             default:
                 return null;
         }