bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00
Code Issues Releases Wiki Activity

refactored naming Site => Login

Browse Source
This commit is contained in:
Kyle Spearrin
2017-01-02 22:26:32 -05:00
parent e01a22de48
commit f7fd28fded
16 changed files with 516 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/tools/toolsImportController.js
View File

@@ -11,15 +11,15 @@
importService.import(model.source, file, importSuccess, importError);
};
function importSuccess(folders, sites, folderRelationships) {
if (!folders.length && !sites.length) {
function importSuccess(folders, logins, folderRelationships) {
if (!folders.length && !logins.length) {
importError('Nothing was imported.');
return;
}
else if (sites.length) {
var halfway = Math.floor(sites.length / 2);
var last = sites.length - 1;
if (siteIsBadData(sites[0]) && siteIsBadData(sites[halfway]) && siteIsBadData(sites[last])) {
else if (logins.length) {
var halfway = Math.floor(logins.length / 2);
var last = logins.length - 1;
if (loginIsBadData(logins[0]) && loginIsBadData(logins[halfway]) && loginIsBadData(logins[last])) {
importError('CSV data is not formatted correctly. Please check your import file and try again.');
return;
}
@@ -27,7 +27,7 @@
apiService.ciphers.import({
folders: cipherService.encryptFolders(folders, cryptoService.getKey()),
sites: cipherService.encryptSites(sites, cryptoService.getKey()),
logins: cipherService.encryptLogins(logins, cryptoService.getKey()),
folderRelationships: folderRelationships
}, function () {
$uibModalInstance.dismiss('cancel');
@@ -38,8 +38,8 @@
}, importError);
}
function siteIsBadData(site) {
return (site.name === null || site.name === '--') && (site.password === null || site.password === '');
function loginIsBadData(login) {
return (login.name === null || login.name === '--') && (login.password === null || login.password === '');
}
function importError(error) {