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

Cipher service setup. Bind data for site view.

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-06 00:22:47 -04:00
parent e83d09ff6d
commit 0402ec648d
6 changed files with 127 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/popup/app/vault/vaultController.js
View File

@@ -1,10 +1,11 @@
angular
.module('bit.vault')
.controller('vaultController', function ($scope, $ionicModal, siteService, folderService, $q) {
.controller('vaultController', function ($scope, $ionicModal, siteService, folderService, $q, cipherService) {
$scope.parentScope = $scope;
$scope.sites = [];
$scope.folders = [];
$scope.focusedSiteId = null;
$scope.$on("$ionicView.enter", function (event, data) {
loadVault();
@@ -29,7 +30,7 @@
id: folders[i].id
});
var folderNamePromise = decrypt(sites[i].name, i);
var folderNamePromise = cipherService.decrypt(sites[i].name, i);
promises.push(folderNamePromise);
folderNamePromise.then(function (obj) {
decFolders[obj.index].name = obj.val;
@@ -43,13 +44,13 @@
favorite: sites[j].favorite
});
var namePromise = decrypt(sites[j].name, j);
var namePromise = cipherService.decrypt(sites[j].name, j);
promises.push(namePromise);
namePromise.then(function (obj) {
decSites[obj.index].name = obj.val;
});
var usernamePromise = decrypt(sites[j].username, j);
var usernamePromise = cipherService.decrypt(sites[j].username, j);
promises.push(usernamePromise);
usernamePromise.then(function (obj) {
decSites[obj.index].username = obj.val;
@@ -64,26 +65,8 @@
});
}
function decrypt(cipherString, index) {
return $q(function (resolve, reject) {
if (!cipherString) {
resolve({
val: null,
index: index
});
}
else {
cipherString.decrypt(function (decString) {
resolve({
val: decString,
index: index
});
});
}
});
}
$scope.viewSite = function (site) {
$scope.focusedSiteId = site.id;
$ionicModal.fromTemplateUrl('app/vault/views/vaultViewSite.html', {
scope: $scope,
animation: 'slide-in-up'
@@ -94,6 +77,7 @@
};
$scope.editSite = function (site) {
$scope.focusedSiteId = site.id;
$ionicModal.fromTemplateUrl('app/vault/views/vaultEditSite.html', {
scope: $scope,
animation: 'slide-in-up'
@@ -119,10 +103,12 @@
$scope.closeViewSite = function () {
$scope.viewSiteModal.hide();
$scope.focusedSiteId = null;
};
$scope.closeEditSite = function () {
$scope.editSiteModal.hide();
$scope.focusedSiteId = null;
};
$scope.$on('modal.hidden', function () {