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

added q promise library. moving cipher service functions out into application services and domain models.

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-15 00:09:48 -04:00
parent 2c44bd5cc8
commit 16a59f8d09
8 changed files with 121 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/popup/app/services/cipherService.js
View File

@@ -1,61 +1,15 @@
angular
.module('bit.services')
.factory('cipherService', function (cryptoService, $q) {
.factory('cipherService', function ($q, siteService) {
var _service = {};
_service.encryptSite = function (site) {
var model = {
id: site.id,
folderId: site.folderId,
favorite: site.favorite
};
return $q(function (resolve, reject) {
encrypt(site.name).then(function (cs) {
model.name = cs;
return encrypt(site.uri);
}).then(function (cs) {
model.uri = cs;
return encrypt(site.username);
}).then(function (cs) {
model.username = cs;
return encrypt(site.password);
}).then(function (cs) {
model.password = cs;
return encrypt(site.notes);
}).then(function (cs) {
model.notes = cs;
resolve(model);
});
});
return $q.when(siteService.encrypt(site));
};
_service.decryptSite = function (site) {
var model = {
id: site.id,
folderId: site.folderId,
favorite: site.favorite
};
return $q(function (resolve, reject) {
decrypt(site.name).then(function (obj) {
model.name = obj.val;
return decrypt(site.uri);
}).then(function (obj) {
model.uri = obj.val;
return decrypt(site.username);
}).then(function (obj) {
model.username = obj.val;
return decrypt(site.password);
}).then(function (obj) {
model.password = obj.val;
return decrypt(site.notes);
}).then(function (obj) {
model.notes = obj.val;
resolve(model);
});
});
return $q.when(site.decrypt());
};
_service.decrypt = decrypt;
@@ -79,13 +33,5 @@
});
}
function encrypt(plaintextString) {
return $q(function (resolve, reject) {
cryptoService.encrypt(plaintextString, function (cipherString) {
resolve(cipherString);
});
});
}
return _service;
});

2
src/popup/app/vault/vaultAddSiteController.js
View File

@@ -48,8 +48,6 @@
$scope.save = function (model) {
$scope.savePromise = cipherService.encryptSite(model).then(function (siteModel) {
var site = new Site(siteModel, true);
return site;
}).then(function (site) {
return saveSite(site).then(function (site) {
toastr.success('Added site');
$scope.close();

2
src/popup/app/vault/vaultEditSiteController.js
View File

@@ -45,8 +45,6 @@ angular
$scope.save = function (model) {
$scope.savePromise = cipherService.encryptSite(model).then(function (siteModel) {
var site = new Site(siteModel, true);
return site;
}).then(function (site) {
return saveSite(site).then(function (site) {
toastr.success('Edited site');
$scope.close();