From 3d4848da904f8dac3fdfc65058a35bf8a3848236 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 19 Jul 2018 15:13:12 -0400
Subject: [PATCH] zoho csv importer

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

diff --git a/jslib b/jslib
index 3f329ca613..8149d7877d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 3f329ca6132ef03b562f0ae67d047daed11cd099
+Subproject commit 8149d7877d97c9c8a945ae934ab9c6a1fe74fd63
diff --git a/src/app/tools/import.component.html b/src/app/tools/import.component.html
index 91b9e1ccdb..1250163eac 100644
--- a/src/app/tools/import.component.html
+++ b/src/app/tools/import.component.html
@@ -126,6 +126,12 @@
             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>
+        <ng-container *ngIf="format === 'zohovaultcsv'">
+            Log into the Zoho web vault (vault.zoho.com). Navigate to "Tools" &rarr; "Export Secrets". Select "All Secrets" and click
+            the "Zoho Vault Format CSV" button. Highlight and copy the data from the textarea. Open a text editor like Notepad
+            and paste the data. Save the data from the text editor as
+            <code>zoho_export.csv</code>.
+        </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 e7cbd8619d..355419220a 100644
--- a/src/app/tools/import.component.ts
+++ b/src/app/tools/import.component.ts
@@ -49,6 +49,7 @@ import { SaferPassCsvImporter } from 'jslib/importers/saferpassCsvImport';
 import { StickyPasswordXmlImporter } from 'jslib/importers/stickyPasswordXmlImporter';
 import { TrueKeyCsvImporter } from 'jslib/importers/truekeyCsvImporter';
 import { UpmCsvImporter } from 'jslib/importers/upmCsvImporter';
+import { ZohoVaultCsvImporter } from 'jslib/importers/zohoVaultCsvImporter';
 
 @Component({
     selector: 'app-import',
@@ -286,6 +287,8 @@ export class ImportComponent implements OnInit {
                 return new AscendoCsvImporter();
             case 'passwordbossjson':
                 return new PasswordBossJsonImporter();
+            case 'zohovaultcsv':
+                return new ZohoVaultCsvImporter();
             default:
                 return null;
         }