devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

user vault associations

This commit is contained in:
Kyle Spearrin 2017-03-13 22:54:57 -04:00
parent 6ece16ccc9
commit 4a6066bb88
7 changed files with 90 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/app/organization/organizationPeopleEditController.js
View File

@ -3,8 +3,8 @@
.controller('organizationPeopleEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService, id) {
$scope.loading = true;
$scope.selectedSubvaults = [];
$scope.selectedSubvaultsReadOnly = [];
$scope.subvaults = [];
$scope.selectedSubvaults = {};
$uibModalInstance.opened.then(function () {
apiService.subvaults.listOrganization({ orgId: $state.params.orgId }, function (list) {
@ -14,70 +14,68 @@
apiService.organizationUsers.get({ orgId: $state.params.orgId, id: id }, function (user) {
if (user && user.Subvaults) {
var subvaults = [];
var subvaultsReadOnly = [];
var subvaults = {};
for (var i = 0; i < user.Subvaults.Data.length; i++) {
subvaults.push(user.Subvaults.Data[i].SubvaultId);
if (user.Subvaults.Data[i].ReadOnly) {
subvaultsReadOnly.push(user.Subvaults.Data[i].SubvaultId);
}
subvaults[user.Subvaults.Data[i].SubvaultId] = {
subvaultId: user.Subvaults.Data[i].SubvaultId,
readOnly: user.Subvaults.Data[i].ReadOnly
};
}
}
$scope.selectedSubvaults = subvaults;
$scope.selectedSubvaultsReadOnly = subvaultsReadOnly;
});
});
$scope.toggleSubvaultSelectionAll = function ($event) {
var subvaultIds = [];
var subvaults = {};
if ($event.target.checked) {
for (var i = 0; i < $scope.subvaults.length; i++) {
subvaultIds.push($scope.subvaults[i].id);
subvaults[$scope.subvaults[i].id] = {
subvaultId: $scope.subvaults[i].id,
readOnly: ($scope.subvaults[i].id in $scope.selectedSubvaults) ?
$scope.selectedSubvaults[$scope.subvaults[i].id].readOnly : false
};
}
}
else {
$scope.selectedSubvaultsReadOnly = [];
}
$scope.selectedSubvaults = subvaultIds;
$scope.selectedSubvaults = subvaults;
};
$scope.toggleSubvaultSelection = function (id) {
var i = $scope.selectedSubvaults.indexOf(id);
if (i > -1) {
$scope.selectedSubvaults.splice(i, 1);
var j = $scope.selectedSubvaultsReadOnly.indexOf(id);
if (j > -1) {
$scope.selectedSubvaultsReadOnly.splice(j, 1);
}
if (id in $scope.selectedSubvaults) {
delete $scope.selectedSubvaults[id];
}
else {
$scope.selectedSubvaults.push(id);
$scope.selectedSubvaults[id] = {
subvaultId: id,
readOnly: false
};
}
};
$scope.toggleSubvaultReadOnlySelection = function (id) {
var i = $scope.selectedSubvaultsReadOnly.indexOf(id);
if (i > -1) {
$scope.selectedSubvaultsReadOnly.splice(i, 1);
}
else {
$scope.selectedSubvaultsReadOnly.push(id);
if (id in $scope.selectedSubvaults) {
$scope.selectedSubvaults[id].readOnly = !!!$scope.selectedSubvaults[id].readOnly;
}
};
$scope.subvaultSelected = function (subvault) {
return subvault.id in $scope.selectedSubvaults;
};
$scope.allSelected = function () {
return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length;
};
$scope.submit = function (model) {
var subvaults = [];
for (var i = 0; i < $scope.selectedSubvaults.length; i++) {
subvaults.push({
id: null,
subvaultId: $scope.selectedSubvaults[i],
readOnly: $scope.selectedSubvaultsReadOnly.indexOf($scope.selectedSubvaults[i]) > -1
});
for (var subvaultId in $scope.selectedSubvaults) {
if ($scope.selectedSubvaults.hasOwnProperty(subvaultId)) {
subvaults.push($scope.selectedSubvaults[subvaultId]);
}
}
apiService.organizationUsers.put({ orgId: $state.params.orgId, id: 0 }, {
apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, {
subvaults: subvaults
}, function () {
$uibModalInstance.close();

60
src/app/organization/organizationPeopleInviteController.js
View File

@ -3,8 +3,8 @@
.controller('organizationPeopleInviteController', function ($scope, $state, $uibModalInstance, apiService, cipherService) {
$scope.loading = true;
$scope.selectedSubvaults = [];
$scope.selectedSubvaultsReadOnly = [];
$scope.subvaults = [];
$scope.selectedSubvaults = {};
$uibModalInstance.opened.then(function () {
apiService.subvaults.listOrganization({ orgId: $state.params.orgId }, function (list) {
@ -14,52 +14,52 @@
});
$scope.toggleSubvaultSelectionAll = function ($event) {
var subvaultIds = [];
if ($event.target.checked)
{
var subvaults = {};
if ($event.target.checked) {
for (var i = 0; i < $scope.subvaults.length; i++) {
subvaultIds.push($scope.subvaults[i].id);
subvaults[$scope.subvaults[i].id] = {
subvaultId: $scope.subvaults[i].id,
readOnly: ($scope.subvaults[i].id in $scope.selectedSubvaults) ?
$scope.selectedSubvaults[$scope.subvaults[i].id].readOnly : false
};
}
}
else {
$scope.selectedSubvaultsReadOnly = [];
}
$scope.selectedSubvaults = subvaultIds;
$scope.selectedSubvaults = subvaults;
};
$scope.toggleSubvaultSelection = function (id) {
var i = $scope.selectedSubvaults.indexOf(id);
if (i > -1) {
$scope.selectedSubvaults.splice(i, 1);
var j = $scope.selectedSubvaultsReadOnly.indexOf(id);
if (j > -1) {
$scope.selectedSubvaultsReadOnly.splice(j, 1);
}
if (id in $scope.selectedSubvaults) {
delete $scope.selectedSubvaults[id];
}
else {
$scope.selectedSubvaults.push(id);
$scope.selectedSubvaults[id] = {
subvaultId: id,
readOnly: false
};
}
};
$scope.toggleSubvaultReadOnlySelection = function (id) {
var i = $scope.selectedSubvaultsReadOnly.indexOf(id);
if (i > -1) {
$scope.selectedSubvaultsReadOnly.splice(i, 1);
}
else {
$scope.selectedSubvaultsReadOnly.push(id);
if (id in $scope.selectedSubvaults) {
$scope.selectedSubvaults[id].readOnly = !!!$scope.selectedSubvaults[id].readOnly;
}
};
$scope.subvaultSelected = function (subvault) {
return subvault.id in $scope.selectedSubvaults;
};
$scope.allSelected = function () {
return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length;
};
$scope.submit = function (model) {
var subvaults = [];
for (var i = 0; i < $scope.selectedSubvaults.length; i++) {
subvaults.push({
subvaultId: $scope.selectedSubvaults[i],
readOnly: $scope.selectedSubvaultsReadOnly.indexOf($scope.selectedSubvaults[i]) > -1
});
for (var subvaultId in $scope.selectedSubvaults) {
if ($scope.selectedSubvaults.hasOwnProperty(subvaultId)) {
subvaults.push($scope.selectedSubvaults[subvaultId]);
}
}
apiService.organizationUsers.invite({ orgId: $state.params.orgId }, {

8
src/app/organization/views/organizationPeopleEdit.html
View File

@ -17,7 +17,7 @@
<tr>
<th style="width: 40px;">
<input type="checkbox"
ng-checked="selectedSubvaults.length === subvaults.length"
ng-checked="allSelected()"
ng-click="toggleSubvaultSelectionAll($event)">
</th>
<th>Name</th>
@ -30,7 +30,7 @@
<input type="checkbox"
name="selectedSubvaults[]"
value="{{subvault.id}}"
ng-checked="selectedSubvaults.indexOf(subvault.id) > -1"
ng-checked="subvaultSelected(subvault)"
ng-click="toggleSubvaultSelection(subvault.id)">
</td>
<td valign="middle">
@ -40,8 +40,8 @@
<input type="checkbox"
name="selectedSubvaultsReadonly[]"
value="{{subvault.id}}"
ng-disabled="selectedSubvaults.indexOf(subvault.id) === -1"
ng-checked="selectedSubvaultsReadOnly.indexOf(subvault.id) > -1"
ng-disabled="!subvaultSelected(subvault)"
ng-checked="subvaultSelected(subvault) && selectedSubvaults[subvault.id].readOnly"
ng-click="toggleSubvaultReadOnlySelection(subvault.id)">
</td>
</tr>

8
src/app/organization/views/organizationPeopleInvite.html
View File

@ -31,7 +31,7 @@
<tr>
<th style="width: 40px;">
<input type="checkbox"
ng-checked="selectedSubvaults.length === subvaults.length"
ng-checked="allSelected()"
ng-click="toggleSubvaultSelectionAll($event)">
</th>
<th>Name</th>
@ -44,7 +44,7 @@
<input type="checkbox"
name="selectedSubvaults[]"
value="{{subvault.id}}"
ng-checked="selectedSubvaults.indexOf(subvault.id) > -1"
ng-checked="subvaultSelected(subvault)"
ng-click="toggleSubvaultSelection(subvault.id)">
</td>
<td valign="middle">
@ -54,8 +54,8 @@
<input type="checkbox"
name="selectedSubvaultsReadonly[]"
value="{{subvault.id}}"
ng-disabled="selectedSubvaults.indexOf(subvault.id) === -1"
ng-checked="selectedSubvaultsReadOnly.indexOf(subvault.id) > -1"
ng-disabled="!subvaultSelected(subvault)"
ng-checked="subvaultSelected(subvault) && selectedSubvaults[subvault.id].readOnly"
ng-click="toggleSubvaultReadOnlySelection(subvault.id)">
</td>
</tr>

1
src/app/services/apiService.js
View File

@ -44,6 +44,7 @@
invite: { url: _apiUri + '/organizations/:orgId/users/invite', method: 'POST', params: { orgId: '@orgId' } },
accept: { url: _apiUri + '/organizations/:orgId/users/:id/accept', method: 'POST', params: { id: '@id', orgId: '@orgId' } },
confirm: { url: _apiUri + '/organizations/:orgId/users/:id/confirm', method: 'POST', params: { id: '@id', orgId: '@orgId' } },
put: { method: 'POST', params: { id: '@id', orgId: '@orgId' } },
del: { url: _apiUri + '/organizations/:orgId/users/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } }
});

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

@ -57,8 +57,8 @@ angular
id: encryptedCipher.Id,
folderId: encryptedCipher.FolderId,
favorite: encryptedCipher.Favorite,
name: decryptProperty(encryptedCipher.Data.Name, key, false),
username: decryptProperty(encryptedCipher.Data.Username, key, true)
name: _service.decryptProperty(encryptedCipher.Data.Name, key, false),
username: _service.decryptProperty(encryptedCipher.Data.Username, key, true)
};
return login;
@ -90,7 +90,7 @@ angular
return {
id: encryptedFolder.Id,
name: decryptProperty(encryptedFolder.Data.Name, null, false)
name: _service.decryptProperty(encryptedFolder.Data.Name, null, false)
};
};
@ -114,12 +114,12 @@ angular
return {
id: encryptedSubvault.Id,
name: catchError ? decryptProperty(encryptedSubvault.Name, key, false) :
name: catchError ? _service.decryptProperty(encryptedSubvault.Name, key, false) :
cryptoService.decrypt(encryptedSubvault.Name, key)
};
};
function decryptProperty(property, key, checkEmpty) {
_service.decryptProperty = function(property, key, checkEmpty) {
if (checkEmpty && (!property || property === '')) {
return null;
}

14
src/app/services/cryptoService.js
View File

@ -31,19 +31,26 @@ angular
}
var orgKeysb64 = {},
_orgKeys = {};
_orgKeys = {},
setKey = false;
for (var i = 0; i < orgKeysCt.length; i++) {
try {
var orgKey = _service.rsaDecrypt(orgKeysCt[i].key, privateKey);
_orgKeys[orgKeysCt[i].id] = orgKey;
orgKeysb64[orgKeysCt[i].id] = forge.util.encode64(orgKey);
setKey = true;
}
catch (e) {
console.log('Cannot set org key ' + i + '. Decryption failed.');
}
}
$sessionStorage.orgKeys = orgKeysb64;
if (setKey) {
$sessionStorage.orgKeys = orgKeysb64;
}
else {
_orgKeys = null;
}
};
_service.addOrgKey = function (orgKeyCt, privateKey) {
@ -63,6 +70,7 @@ angular
orgKeysb64[orgKeyCt.id] = forge.util.encode64(orgKey);
}
catch (e) {
_orgKeys = null;
console.log('Cannot set org key. Decryption failed.');
}
@ -177,7 +185,7 @@ angular
};
_service.clearOrgKeys = function () {
_orgKeys = {};
_orgKeys = null;
delete $sessionStorage.orgKeys;
};