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

load folders from it's api

Browse Source
This commit is contained in:
Kyle Spearrin 2017-03-18 22:55:54 -04:00
parent acf124c81e
commit 22ab5d334e
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/services/cipherService.js
View File

@ -90,7 +90,7 @@ angular
return { return {
id: encryptedFolder.Id, id: encryptedFolder.Id,
name: _service.decryptProperty(encryptedFolder.Data.Name, null, false) name: _service.decryptProperty(encryptedFolder.Name, null, false)
}; };
}; };

29
src/app/vault/vaultController.js
View File

@ -2,34 +2,41 @@
.module('bit.vault') .module('bit.vault')
.controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr, .controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr,
cipherService) { cipherService, $q) {
$scope.logins = []; $scope.logins = [];
$scope.folders = []; $scope.folders = [];
$scope.loading = true; $scope.loading = true;
$scope.$on('$viewContentLoaded', function () {
apiService.ciphers.list({}, function (ciphers) {
$scope.loading = false;
var decLogins = []; $scope.$on('$viewContentLoaded', function () {
var folderPromise = apiService.folders.list({}, function (folders) {
var decFolders = [{ var decFolders = [{
id: null, id: null,
name: '(none)' name: '(none)'
}]; }];
for (var i = 0; i < ciphers.Data.length; i++) { for (var i = 0; i < folders.Data.length; i++) {
if (ciphers.Data[i].Type === 0) { var decFolder = cipherService.decryptFolderPreview(folders.Data[i]);
var decFolder = cipherService.decryptFolderPreview(ciphers.Data[i]);
decFolders.push(decFolder); decFolders.push(decFolder);
} }
else {
$scope.folders = decFolders;
}).$promise;
var cipherPromise = apiService.ciphers.list({}, function (ciphers) {
var decLogins = [];
for (var i = 0; i < ciphers.Data.length; i++) {
if (ciphers.Data[i].Type === 1) {
var decLogin = cipherService.decryptLoginPreview(ciphers.Data[i]); var decLogin = cipherService.decryptLoginPreview(ciphers.Data[i]);
decLogins.push(decLogin); decLogins.push(decLogin);
} }
} }
$scope.folders = decFolders;
$scope.logins = decLogins; $scope.logins = decLogins;
}).$promise;
$q.all([folderPromise, cipherPromise]).then(function () {
$scope.loading = false;
}); });
}); });