From 2fe65e27e2664ebef92bd8e63129d5097bacc180 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 21 Jul 2018 08:21:08 -0400 Subject: [PATCH] normalize new lines and trim csv data --- src/importers/baseImporter.ts | 1 + src/importers/lastpassCsvImporter.ts | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/importers/baseImporter.ts b/src/importers/baseImporter.ts index d7ee9d5f72..ca642666cf 100644 --- a/src/importers/baseImporter.ts +++ b/src/importers/baseImporter.ts @@ -72,6 +72,7 @@ export abstract class BaseImporter { } protected parseCsv(data: string, header: boolean): any[] { + data = this.splitNewLine(data).join('\n').trim(); const result = papa.parse(data, { header: header, encoding: 'UTF-8', diff --git a/src/importers/lastpassCsvImporter.ts b/src/importers/lastpassCsvImporter.ts index cdaa0629aa..acb839c589 100644 --- a/src/importers/lastpassCsvImporter.ts +++ b/src/importers/lastpassCsvImporter.ts @@ -39,11 +39,6 @@ export class LastPassCsvImporter extends BaseImporter implements Importer { } const cipher = this.buildBaseCipher(value); - if (cipher.name === '--' && results.length > 2 && index >= (results.length - 2)) { - // LastPass file traditionally has two empty lines at the end - return; - } - if (cipher.type === CipherType.Login) { cipher.notes = this.getValueOrDefault(value.extra); cipher.login = new LoginView();