Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-26 12:25:20 +01:00
Code Issues Projects Releases Wiki Activity

Added Chrome csv importer. Adjustments to 1Password importer in preparation for detecting different formats.

Browse Source
This commit is contained in:
Kyle Spearrin 2016-10-19 18:22:18 -04:00
parent 8badc1a354
commit b6c9dba0fc
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Web/wwwroot/app/services/importService.js
View File

@ -32,6 +32,9 @@
case '1password1pif':
import1Password1Pif(file, success, error);
break;
case 'chromecsv':
importChromeCsv(file, success, error);
break;
default:
error();
break;
@ -556,12 +559,18 @@
reader.readAsText(file, 'utf-8');
reader.onload = function (evt) {
var fileContent = evt.target.result;
var jsonParts = fileContent.split(/(?:\r\n|\r|\n)\*\*\*.*?\*\*\*(?:\r\n|\r|\n)/);
var jsonString = '[' + jsonParts.join(',') + ']';
var items = JSON.parse(jsonString);
var fileLines = fileContent.split(/(?:\r\n|\r|\n)/);
//var jsonParts = fileContent.split(/(?:\r\n|\r|\n)\*\*\*.*?\*\*\*(?:\r\n|\r|\n)/);
//var jsonString = '[' + jsonParts.join(',') + ']';
//var items = JSON.parse(jsonString);
for (i = 0; i < items.length; i++) {
var item = items[i];
for (i = 0; i < fileLines.length; i++) {
var line = fileLines[i];
if (!line.length || line[0] !== '{') {
continue;
}
var item = JSON.parse(line);
if (item.typeName !== 'webforms.WebForm') {
continue;
}
@ -576,7 +585,7 @@
};
if (item.secureContents) {
if (item.secureContents.notesPlain) {
if (item.secureContents.notesPlain && item.secureContents.notesPlain !== '') {
site.notes = item.secureContents.notesPlain;
}
@ -614,5 +623,32 @@
};
}
function importChromeCsv(file, success, error) {
Papa.parse(file, {
header: true,
encoding: 'UTF-8',
complete: function (results) {
parseCsvErrors(results);
var folders = [],
sites = [],
siteRelationships = [];
angular.forEach(results.data, function (value, key) {
sites.push({
favorite: false,
uri: value.url && value.url !== '' ? trimUri(value.url) : null,
username: value.username && value.username !== '' ? value.username : null,
password: value.password && value.password !== '' ? value.password : null,
notes: null,
name: value.name && value.name !== '' ? value.name : '--',
});
});
success(folders, sites, siteRelationships);
}
});
}
return _service;
});

1
src/Web/wwwroot/app/tools/toolsImportController.js
View File

@ -13,6 +13,7 @@
function importSuccess(folders, sites, folderRelationships) {
if (!folders.length && !sites.length) {
$uibModalInstance.dismiss('cancel');
toastr.error('Nothing was imported.');
return;
}

1
src/Web/wwwroot/app/tools/views/toolsImport.html
View File

@ -9,6 +9,7 @@
<select id="source" name="source" class="form-control" ng-model="model.source">
<option value="local">bitwarden (csv)</option>
<option value="lastpass">LastPass (csv)</option>
<option value="chromecsv">Chrome (csv)</option>
<option value="safeincloudxml">SafeInCloud (xml)</option>
<option value="safeincloudcsv">SafeInCloud (csv)</option>
<option value="keypassxml">KeyPass (xml)</option>