diff --git a/src/app/config.js b/src/app/config.js index c696535da9..8e90cd745e 100644 --- a/src/app/config.js +++ b/src/app/config.js @@ -82,11 +82,11 @@ angular refreshFromServer: false } }) - .state('backend.user.subvaults', { - url: '^/subvaults', - templateUrl: 'app/vault/views/vaultSubvaults.html', - controller: 'vaultSubvaultsController', - data: { pageTitle: 'Subvaults' } + .state('backend.user.collections', { + url: '^/collections', + templateUrl: 'app/vault/views/vaultCollections.html', + controller: 'vaultCollectionsController', + data: { pageTitle: 'Collections' } }) .state('backend.user.settings', { url: '^/settings', @@ -134,11 +134,11 @@ angular controller: 'organizationPeopleController', data: { pageTitle: 'Organization People' } }) - .state('backend.org.subvaults', { - url: '/organization/:orgId/subvaults', - templateUrl: 'app/organization/views/organizationSubvaults.html', - controller: 'organizationSubvaultsController', - data: { pageTitle: 'Organization Subvaults' } + .state('backend.org.collections', { + url: '/organization/:orgId/collections', + templateUrl: 'app/organization/views/organizationCollections.html', + controller: 'organizationCollectionsController', + data: { pageTitle: 'Organization Collections' } }) .state('backend.org.settings', { url: '/organization/:orgId/settings', diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js index f4f819e009..308a95e9f9 100644 --- a/src/app/organization/organizationPeopleController.js +++ b/src/app/organization/organizationPeopleController.js @@ -94,7 +94,7 @@ email: list.Data[i].Email, status: list.Data[i].Status, type: list.Data[i].Type, - accessAllSubvaults: list.Data[i].AccessAllSubvaults + accessAllCollections: list.Data[i].AccessAllCollections }; users.push(user); diff --git a/src/app/organization/organizationPeopleEditController.js b/src/app/organization/organizationPeopleEditController.js index af812c59fc..69efd33373 100644 --- a/src/app/organization/organizationPeopleEditController.js +++ b/src/app/organization/organizationPeopleEditController.js @@ -6,88 +6,88 @@ $analytics.eventTrack('organizationPeopleEditController', { category: 'Modal' }); $scope.loading = true; - $scope.subvaults = []; - $scope.selectedSubvaults = {}; + $scope.collections = []; + $scope.selectedCollections = {}; $uibModalInstance.opened.then(function () { - apiService.subvaults.listOrganization({ orgId: $state.params.orgId }, function (list) { - $scope.subvaults = cipherService.decryptSubvaults(list.Data, $state.params.orgId, true); + apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (list) { + $scope.collections = cipherService.decryptCollections(list.Data, $state.params.orgId, true); $scope.loading = false; }); apiService.organizationUsers.get({ orgId: $state.params.orgId, id: id }, function (user) { - var subvaults = {}; - if (user && user.Subvaults) { - for (var i = 0; i < user.Subvaults.Data.length; i++) { - subvaults[user.Subvaults.Data[i].SubvaultId] = { - subvaultId: user.Subvaults.Data[i].SubvaultId, - readOnly: user.Subvaults.Data[i].ReadOnly + var collections = {}; + if (user && user.Collections) { + for (var i = 0; i < user.Collections.Data.length; i++) { + collections[user.Collections.Data[i].CollectionId] = { + collectionId: user.Collections.Data[i].CollectionId, + readOnly: user.Collections.Data[i].ReadOnly }; } } $scope.email = user.Email; $scope.type = user.Type; - $scope.accessAllSubvaults = user.AccessAllSubvaults; - $scope.selectedSubvaults = subvaults; + $scope.accessAllCollections = user.AccessAllCollections; + $scope.selectedCollections = collections; }); }); - $scope.toggleSubvaultSelectionAll = function ($event) { - var subvaults = {}; + $scope.toggleCollectionSelectionAll = function ($event) { + var collections = {}; if ($event.target.checked) { - for (var i = 0; i < $scope.subvaults.length; i++) { - 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 + for (var i = 0; i < $scope.collections.length; i++) { + collections[$scope.collections[i].id] = { + collectionId: $scope.collections[i].id, + readOnly: ($scope.collections[i].id in $scope.selectedCollections) ? + $scope.selectedCollections[$scope.collections[i].id].readOnly : false }; } } - $scope.selectedSubvaults = subvaults; + $scope.selectedCollections = collections; }; - $scope.toggleSubvaultSelection = function (id) { - if (id in $scope.selectedSubvaults) { - delete $scope.selectedSubvaults[id]; + $scope.toggleCollectionSelection = function (id) { + if (id in $scope.selectedCollections) { + delete $scope.selectedCollections[id]; } else { - $scope.selectedSubvaults[id] = { - subvaultId: id, + $scope.selectedCollections[id] = { + collectionId: id, readOnly: false }; } }; - $scope.toggleSubvaultReadOnlySelection = function (id) { - if (id in $scope.selectedSubvaults) { - $scope.selectedSubvaults[id].readOnly = !!!$scope.selectedSubvaults[id].readOnly; + $scope.toggleCollectionReadOnlySelection = function (id) { + if (id in $scope.selectedCollections) { + $scope.selectedCollections[id].readOnly = !!!$scope.selectedCollections[id].readOnly; } }; - $scope.subvaultSelected = function (subvault) { - return subvault.id in $scope.selectedSubvaults; + $scope.collectionSelected = function (collection) { + return collection.id in $scope.selectedCollections; }; $scope.allSelected = function () { - return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length; + return Object.keys($scope.selectedCollections).length === $scope.collections.length; }; $scope.submitPromise = null; $scope.submit = function (model) { - var subvaults = []; - if (!$scope.accessAllSubvaults) { - for (var subvaultId in $scope.selectedSubvaults) { - if ($scope.selectedSubvaults.hasOwnProperty(subvaultId)) { - subvaults.push($scope.selectedSubvaults[subvaultId]); + var collections = []; + if (!$scope.accessAllCollections) { + for (var collectionId in $scope.selectedCollections) { + if ($scope.selectedCollections.hasOwnProperty(collectionId)) { + collections.push($scope.selectedCollections[collectionId]); } } } $scope.submitPromise = apiService.organizationUsers.put({ orgId: $state.params.orgId, id: id }, { type: $scope.type, - subvaults: subvaults, - accessAllSubvaults: $scope.accessAllSubvaults + collections: collections, + accessAllCollections: $scope.accessAllCollections }, function () { $analytics.eventTrack('Edited User'); $uibModalInstance.close(); diff --git a/src/app/organization/organizationPeopleInviteController.js b/src/app/organization/organizationPeopleInviteController.js index 2d1aff4685..d8ad5c9801 100644 --- a/src/app/organization/organizationPeopleInviteController.js +++ b/src/app/organization/organizationPeopleInviteController.js @@ -6,68 +6,68 @@ $analytics.eventTrack('organizationPeopleInviteController', { category: 'Modal' }); $scope.loading = true; - $scope.subvaults = []; - $scope.selectedSubvaults = {}; + $scope.collections = []; + $scope.selectedCollections = {}; $scope.model = { type: 'User' }; $uibModalInstance.opened.then(function () { - apiService.subvaults.listOrganization({ orgId: $state.params.orgId }, function (list) { - $scope.subvaults = cipherService.decryptSubvaults(list.Data, $state.params.orgId, true); + apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (list) { + $scope.collections = cipherService.decryptCollections(list.Data, $state.params.orgId, true); $scope.loading = false; }); }); - $scope.toggleSubvaultSelectionAll = function ($event) { - var subvaults = {}; + $scope.toggleCollectionSelectionAll = function ($event) { + var collections = {}; if ($event.target.checked) { - for (var i = 0; i < $scope.subvaults.length; i++) { - 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 + for (var i = 0; i < $scope.collections.length; i++) { + collections[$scope.collections[i].id] = { + collectionId: $scope.collections[i].id, + readOnly: ($scope.collections[i].id in $scope.selectedCollections) ? + $scope.selectedCollections[$scope.collections[i].id].readOnly : false }; } } - $scope.selectedSubvaults = subvaults; + $scope.selectedCollections = collections; }; - $scope.toggleSubvaultSelection = function (id) { - if (id in $scope.selectedSubvaults) { - delete $scope.selectedSubvaults[id]; + $scope.toggleCollectionSelection = function (id) { + if (id in $scope.selectedCollections) { + delete $scope.selectedCollections[id]; } else { - $scope.selectedSubvaults[id] = { - subvaultId: id, + $scope.selectedCollections[id] = { + collectionId: id, readOnly: false }; } }; - $scope.toggleSubvaultReadOnlySelection = function (id) { - if (id in $scope.selectedSubvaults) { - $scope.selectedSubvaults[id].readOnly = !!!$scope.selectedSubvaults[id].readOnly; + $scope.toggleCollectionReadOnlySelection = function (id) { + if (id in $scope.selectedCollections) { + $scope.selectedCollections[id].readOnly = !!!$scope.selectedCollections[id].readOnly; } }; - $scope.subvaultSelected = function (subvault) { - return subvault.id in $scope.selectedSubvaults; + $scope.collectionSelected = function (collection) { + return collection.id in $scope.selectedCollections; }; $scope.allSelected = function () { - return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length; + return Object.keys($scope.selectedCollections).length === $scope.collections.length; }; $scope.submitPromise = null; $scope.submit = function (model) { - var subvaults = []; + var collections = []; - if (!model.accessAllSubvaults) { - for (var subvaultId in $scope.selectedSubvaults) { - if ($scope.selectedSubvaults.hasOwnProperty(subvaultId)) { - subvaults.push($scope.selectedSubvaults[subvaultId]); + if (!model.accessAllCollections) { + for (var collectionId in $scope.selectedCollections) { + if ($scope.selectedCollections.hasOwnProperty(collectionId)) { + collections.push($scope.selectedCollections[collectionId]); } } } @@ -75,8 +75,8 @@ $scope.submitPromise = apiService.organizationUsers.invite({ orgId: $state.params.orgId }, { email: model.email, type: model.type, - subvaults: subvaults, - accessAllSubvaults: model.accessAllSubvaults + collections: collections, + accessAllCollections: model.accessAllCollections }, function () { $analytics.eventTrack('Invited User'); $uibModalInstance.close(); diff --git a/src/app/organization/organizationSubvaultsAddController.js b/src/app/organization/organizationSubvaultsAddController.js index 256d84ce46..d58efe7011 100644 --- a/src/app/organization/organizationSubvaultsAddController.js +++ b/src/app/organization/organizationSubvaultsAddController.js @@ -1,16 +1,16 @@ angular .module('bit.organization') - .controller('organizationSubvaultsAddController', function ($scope, $state, $uibModalInstance, apiService, cipherService, + .controller('organizationCollectionsAddController', function ($scope, $state, $uibModalInstance, apiService, cipherService, $analytics) { - $analytics.eventTrack('organizationSubvaultsAddController', { category: 'Modal' }); + $analytics.eventTrack('organizationCollectionsAddController', { category: 'Modal' }); $scope.submit = function (model) { - var subvault = cipherService.encryptSubvault(model, $state.params.orgId); - $scope.submitPromise = apiService.subvaults.post({ orgId: $state.params.orgId }, subvault, function (response) { - $analytics.eventTrack('Created Subvault'); - var decSubvault = cipherService.decryptSubvault(response, $state.params.orgId, true); - $uibModalInstance.close(decSubvault); + var collection = cipherService.encryptCollection(model, $state.params.orgId); + $scope.submitPromise = apiService.collections.post({ orgId: $state.params.orgId }, collection, function (response) { + $analytics.eventTrack('Created Collection'); + var decCollection = cipherService.decryptCollection(response, $state.params.orgId, true); + $uibModalInstance.close(decCollection); }).$promise; }; diff --git a/src/app/organization/organizationSubvaultsController.js b/src/app/organization/organizationSubvaultsController.js index 072b47fe2f..c761fab26a 100644 --- a/src/app/organization/organizationSubvaultsController.js +++ b/src/app/organization/organizationSubvaultsController.js @@ -1,9 +1,9 @@ angular .module('bit.organization') - .controller('organizationSubvaultsController', function ($scope, $state, apiService, $uibModal, cipherService, $filter, + .controller('organizationCollectionsController', function ($scope, $state, apiService, $uibModal, cipherService, $filter, toastr, $analytics) { - $scope.subvaults = []; + $scope.collections = []; $scope.loading = true; $scope.$on('$viewContentLoaded', function () { loadList(); @@ -12,41 +12,41 @@ $scope.add = function () { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/organization/views/organizationSubvaultsAdd.html', - controller: 'organizationSubvaultsAddController' + templateUrl: 'app/organization/views/organizationCollectionsAdd.html', + controller: 'organizationCollectionsAddController' }); - modal.result.then(function (subvault) { - $scope.subvaults.push(subvault); + modal.result.then(function (collection) { + $scope.collections.push(collection); }); }; - $scope.edit = function (subvault) { + $scope.edit = function (collection) { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/organization/views/organizationSubvaultsEdit.html', - controller: 'organizationSubvaultsEditController', + templateUrl: 'app/organization/views/organizationCollectionsEdit.html', + controller: 'organizationCollectionsEditController', resolve: { - id: function () { return subvault.id; } + id: function () { return collection.id; } } }); - modal.result.then(function (editedSubvault) { - var existingSubvaults = $filter('filter')($scope.subvaults, { id: editedSubvault.id }, true); - if (existingSubvaults && existingSubvaults.length > 0) { - existingSubvaults[0].name = editedSubvault.name; + modal.result.then(function (editedCollection) { + var existingCollections = $filter('filter')($scope.collections, { id: editedCollection.id }, true); + if (existingCollections && existingCollections.length > 0) { + existingCollections[0].name = editedCollection.name; } }); }; - $scope.users = function (subvault) { + $scope.users = function (collection) { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/organization/views/organizationSubvaultsUsers.html', - controller: 'organizationSubvaultsUsersController', + templateUrl: 'app/organization/views/organizationCollectionsUsers.html', + controller: 'organizationCollectionsUsersController', size: 'lg', resolve: { - subvault: function () { return subvault; } + collection: function () { return collection; } } }); @@ -55,13 +55,13 @@ }); }; - $scope.groups = function (subvault) { + $scope.groups = function (collection) { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/organization/views/organizationSubvaultsGroups.html', - controller: 'organizationSubvaultsGroupsController', + templateUrl: 'app/organization/views/organizationCollectionsGroups.html', + controller: 'organizationCollectionsGroupsController', resolve: { - subvault: function () { return subvault; } + collection: function () { return collection; } } }); @@ -70,27 +70,27 @@ }); }; - $scope.delete = function (subvault) { - if (!confirm('Are you sure you want to delete this subvault (' + subvault.name + ')?')) { + $scope.delete = function (collection) { + if (!confirm('Are you sure you want to delete this collection (' + collection.name + ')?')) { return; } - apiService.subvaults.del({ orgId: $state.params.orgId, id: subvault.id }, function () { - var index = $scope.subvaults.indexOf(subvault); + apiService.collections.del({ orgId: $state.params.orgId, id: collection.id }, function () { + var index = $scope.collections.indexOf(collection); if (index > -1) { - $scope.subvaults.splice(index, 1); + $scope.collections.splice(index, 1); } - $analytics.eventTrack('Deleted Subvault'); - toastr.success(subvault.name + ' has been deleted.', 'Subvault Deleted'); + $analytics.eventTrack('Deleted Collection'); + toastr.success(collection.name + ' has been deleted.', 'Collection Deleted'); }, function () { - toastr.error(subvault.name + ' was not able to be deleted.', 'Error'); + toastr.error(collection.name + ' was not able to be deleted.', 'Error'); }); }; function loadList() { - apiService.subvaults.listOrganization({ orgId: $state.params.orgId }, function (list) { - $scope.subvaults = cipherService.decryptSubvaults(list.Data, $state.params.orgId, true); + apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (list) { + $scope.collections = cipherService.decryptCollections(list.Data, $state.params.orgId, true); $scope.loading = false; }); } diff --git a/src/app/organization/organizationSubvaultsEditController.js b/src/app/organization/organizationSubvaultsEditController.js index ed5a7f2443..80ba1eabcd 100644 --- a/src/app/organization/organizationSubvaultsEditController.js +++ b/src/app/organization/organizationSubvaultsEditController.js @@ -1,23 +1,23 @@ angular .module('bit.organization') - .controller('organizationSubvaultsEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService, + .controller('organizationCollectionsEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService, $analytics, id) { - $analytics.eventTrack('organizationSubvaultsEditController', { category: 'Modal' }); - $scope.subvault = {}; + $analytics.eventTrack('organizationCollectionsEditController', { category: 'Modal' }); + $scope.collection = {}; $uibModalInstance.opened.then(function () { - apiService.subvaults.get({ orgId: $state.params.orgId, id: id }, function (subvault) { - $scope.subvault = cipherService.decryptSubvault(subvault); + apiService.collections.get({ orgId: $state.params.orgId, id: id }, function (collection) { + $scope.collection = cipherService.decryptCollection(collection); }); }); $scope.submit = function (model) { - var subvault = cipherService.encryptSubvault(model, $state.params.orgId); - $scope.submitPromise = apiService.subvaults.put({ orgId: $state.params.orgId }, subvault, function (response) { - $analytics.eventTrack('Edited Subvault'); - var decSubvault = cipherService.decryptSubvault(response, $state.params.orgId, true); - $uibModalInstance.close(decSubvault); + var collection = cipherService.encryptCollection(model, $state.params.orgId); + $scope.submitPromise = apiService.collections.put({ orgId: $state.params.orgId }, collection, function (response) { + $analytics.eventTrack('Edited Collection'); + var decCollection = cipherService.decryptCollection(response, $state.params.orgId, true); + $uibModalInstance.close(decCollection); }).$promise; }; diff --git a/src/app/organization/organizationSubvaultsGroupsController.js b/src/app/organization/organizationSubvaultsGroupsController.js index 0016d23624..170dd2f349 100644 --- a/src/app/organization/organizationSubvaultsGroupsController.js +++ b/src/app/organization/organizationSubvaultsGroupsController.js @@ -1,9 +1,9 @@ angular .module('bit.organization') - .controller('organizationSubvaultsGroupsController', function ($scope, $state, $uibModalInstance, subvault, $analytics) { - $analytics.eventTrack('organizationSubvaultsGroupsController', { category: 'Modal' }); - $scope.subvault = subvault; + .controller('organizationCollectionsGroupsController', function ($scope, $state, $uibModalInstance, collection, $analytics) { + $analytics.eventTrack('organizationCollectionsGroupsController', { category: 'Modal' }); + $scope.collection = collection; $scope.close = function () { $uibModalInstance.dismiss('cancel'); diff --git a/src/app/organization/organizationSubvaultsUsersController.js b/src/app/organization/organizationSubvaultsUsersController.js index 38bcda19c8..30967da2af 100644 --- a/src/app/organization/organizationSubvaultsUsersController.js +++ b/src/app/organization/organizationSubvaultsUsersController.js @@ -1,19 +1,19 @@ angular .module('bit.organization') - .controller('organizationSubvaultsUsersController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - $analytics, subvault, toastr) { - $analytics.eventTrack('organizationSubvaultsUsersController', { category: 'Modal' }); + .controller('organizationCollectionsUsersController', function ($scope, $state, $uibModalInstance, apiService, cipherService, + $analytics, collection, toastr) { + $analytics.eventTrack('organizationCollectionsUsersController', { category: 'Modal' }); $scope.loading = true; - $scope.subvault = subvault; + $scope.collection = collection; $scope.users = []; $uibModalInstance.opened.then(function () { $scope.loading = false; - apiService.subvaultUsers.listSubvault( + apiService.collectionUsers.listCollection( { orgId: $state.params.orgId, - subvaultId: subvault.id + collectionId: collection.id }, function (userList) { if (userList && userList.Data.length) { @@ -27,7 +27,7 @@ type: userList.Data[i].Type, status: userList.Data[i].Status, readOnly: userList.Data[i].ReadOnly, - accessAllSubvaults: userList.Data[i].AccessAllSubvaults + accessAllCollections: userList.Data[i].AccessAllCollections }); } $scope.users = users; @@ -37,13 +37,13 @@ $scope.remove = function (user) { if (!confirm('Are you sure you want to remove this user (' + user.email + ') from this ' + - 'subvault (' + subvault.name + ')?')) { + 'collection (' + collection.name + ')?')) { return; } - apiService.subvaultUsers.del({ orgId: $state.params.orgId, id: user.id }, null, function () { + apiService.collectionUsers.del({ orgId: $state.params.orgId, id: user.id }, null, function () { toastr.success(user.email + ' has been removed.', 'User Removed'); - $analytics.eventTrack('Removed User From Subvault'); + $analytics.eventTrack('Removed User From Collection'); var index = $scope.users.indexOf(user); if (index > -1) { $scope.users.splice(index, 1); diff --git a/src/app/organization/organizationVaultController.js b/src/app/organization/organizationVaultController.js index 1b3b251344..f72a4c9b8f 100644 --- a/src/app/organization/organizationVaultController.js +++ b/src/app/organization/organizationVaultController.js @@ -4,25 +4,25 @@ .controller('organizationVaultController', function ($scope, apiService, cipherService, $analytics, $q, $state, $localStorage, $uibModal, $filter) { $scope.logins = []; - $scope.subvaults = []; + $scope.collections = []; $scope.loading = true; $scope.$on('$viewContentLoaded', function () { - var subvaultPromise = apiService.subvaults.listOrganization({ orgId: $state.params.orgId }, function (subvaults) { - var decSubvaults = [{ + var collectionPromise = apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (collections) { + var decCollections = [{ id: null, name: 'Unassigned', - collapsed: $localStorage.collapsedOrgSubvaults && 'unassigned' in $localStorage.collapsedOrgSubvaults + collapsed: $localStorage.collapsedOrgCollections && 'unassigned' in $localStorage.collapsedOrgCollections }]; - for (var i = 0; i < subvaults.Data.length; i++) { - var decSubvault = cipherService.decryptSubvault(subvaults.Data[i], null, true); - decSubvault.collapsed = $localStorage.collapsedOrgSubvaults && - decSubvault.id in $localStorage.collapsedOrgSubvaults; - decSubvaults.push(decSubvault); + for (var i = 0; i < collections.Data.length; i++) { + var decCollection = cipherService.decryptCollection(collections.Data[i], null, true); + decCollection.collapsed = $localStorage.collapsedOrgCollections && + decCollection.id in $localStorage.collapsedOrgCollections; + decCollections.push(decCollection); } - $scope.subvaults = decSubvaults; + $scope.collections = decCollections; }).$promise; var cipherPromise = apiService.ciphers.listOrganizationDetails({ organizationId: $state.params.orgId }, @@ -39,22 +39,22 @@ $scope.logins = decLogins; }).$promise; - $q.all([subvaultPromise, cipherPromise]).then(function () { + $q.all([collectionPromise, cipherPromise]).then(function () { $scope.loading = false; }); }); - $scope.filterBySubvault = function (subvault) { + $scope.filterByCollection = function (collection) { return function (cipher) { - if (!cipher.subvaultIds || !cipher.subvaultIds.length) { - return subvault.id === null; + if (!cipher.collectionIds || !cipher.collectionIds.length) { + return collection.id === null; } - return cipher.subvaultIds.indexOf(subvault.id) > -1; + return cipher.collectionIds.indexOf(collection.id) > -1; }; }; - $scope.subvaultSort = function (item) { + $scope.collectionSort = function (item) { if (!item.id) { return ''; } @@ -62,58 +62,58 @@ return item.name.toLowerCase(); }; - $scope.collapseExpand = function (subvault) { - if (!$localStorage.collapsedOrgSubvaults) { - $localStorage.collapsedOrgSubvaults = {}; + $scope.collapseExpand = function (collection) { + if (!$localStorage.collapsedOrgCollections) { + $localStorage.collapsedOrgCollections = {}; } - var id = subvault.id || 'unassigned'; + var id = collection.id || 'unassigned'; - if (id in $localStorage.collapsedOrgSubvaults) { - delete $localStorage.collapsedOrgSubvaults[id]; + if (id in $localStorage.collapsedOrgCollections) { + delete $localStorage.collapsedOrgCollections[id]; } else { - $localStorage.collapsedOrgSubvaults[id] = true; + $localStorage.collapsedOrgCollections[id] = true; } }; - $scope.editSubvaults = function (cipher) { + $scope.editCollections = function (cipher) { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/organization/views/organizationVaultLoginSubvaults.html', - controller: 'organizationVaultLoginSubvaultsController', + templateUrl: 'app/organization/views/organizationVaultLoginCollections.html', + controller: 'organizationVaultLoginCollectionsController', resolve: { cipher: function () { return cipher; }, - subvaults: function () { return $scope.subvaults; } + collections: function () { return $scope.collections; } } }); modal.result.then(function (response) { - if (response.subvaultIds) { - cipher.subvaultIds = response.subvaultIds; + if (response.collectionIds) { + cipher.collectionIds = response.collectionIds; } }); }; - $scope.removeLogin = function (login, subvault) { + $scope.removeLogin = function (login, collection) { if (!confirm('Are you sure you want to remove this login (' + login.name + ') from the ' + - 'subvault (' + subvault.name + ') ?')) { + 'collection (' + collection.name + ') ?')) { return; } var request = { - subvaultIds: [] + collectionIds: [] }; - for (var i = 0; i < login.subvaultIds.length; i++) { - if (login.subvaultIds[i] !== subvault.id) { - request.subvaultIds.push(login.subvaultIds[i]); + for (var i = 0; i < login.collectionIds.length; i++) { + if (login.collectionIds[i] !== collection.id) { + request.collectionIds.push(login.collectionIds[i]); } } - apiService.ciphers.putSubvaults({ id: login.id }, request).$promise.then(function (response) { - $analytics.eventTrack('Removed Login From Subvault'); - login.subvaultIds = request.subvaultIds; + apiService.ciphers.putCollections({ id: login.id }, request).$promise.then(function (response) { + $analytics.eventTrack('Removed Login From Collection'); + login.collectionIds = request.collectionIds; }); }; diff --git a/src/app/organization/organizationVaultLoginSubvaultsController.js b/src/app/organization/organizationVaultLoginSubvaultsController.js index 5ebf07b547..4dbd3e6e5a 100644 --- a/src/app/organization/organizationVaultLoginSubvaultsController.js +++ b/src/app/organization/organizationVaultLoginSubvaultsController.js @@ -1,78 +1,78 @@ angular .module('bit.organization') - .controller('organizationVaultLoginSubvaultsController', function ($scope, apiService, $uibModalInstance, cipherService, - cipher, $analytics, subvaults) { - $analytics.eventTrack('organizationVaultLoginSubvaultsController', { category: 'Modal' }); + .controller('organizationVaultLoginCollectionsController', function ($scope, apiService, $uibModalInstance, cipherService, + cipher, $analytics, collections) { + $analytics.eventTrack('organizationVaultLoginCollectionsController', { category: 'Modal' }); $scope.cipher = {}; - $scope.subvaults = []; - $scope.selectedSubvaults = {}; + $scope.collections = []; + $scope.selectedCollections = {}; $uibModalInstance.opened.then(function () { - var subvaultUsed = []; - for (var i = 0; i < subvaults.length; i++) { - if (subvaults[i].id) { - subvaultUsed.push(subvaults[i]); + var collectionUsed = []; + for (var i = 0; i < collections.length; i++) { + if (collections[i].id) { + collectionUsed.push(collections[i]); } } - $scope.subvaults = subvaultUsed; + $scope.collections = collectionUsed; $scope.cipher = cipher; - var selectedSubvaults = {}; - if ($scope.cipher.subvaultIds) { - for (i = 0; i < $scope.cipher.subvaultIds.length; i++) { - selectedSubvaults[$scope.cipher.subvaultIds[i]] = true; + var selectedCollections = {}; + if ($scope.cipher.collectionIds) { + for (i = 0; i < $scope.cipher.collectionIds.length; i++) { + selectedCollections[$scope.cipher.collectionIds[i]] = true; } } - $scope.selectedSubvaults = selectedSubvaults; + $scope.selectedCollections = selectedCollections; }); - $scope.toggleSubvaultSelectionAll = function ($event) { - var subvaults = {}; + $scope.toggleCollectionSelectionAll = function ($event) { + var collections = {}; if ($event.target.checked) { - for (var i = 0; i < $scope.subvaults.length; i++) { - subvaults[$scope.subvaults[i].id] = true; + for (var i = 0; i < $scope.collections.length; i++) { + collections[$scope.collections[i].id] = true; } } - $scope.selectedSubvaults = subvaults; + $scope.selectedCollections = collections; }; - $scope.toggleSubvaultSelection = function (id) { - if (id in $scope.selectedSubvaults) { - delete $scope.selectedSubvaults[id]; + $scope.toggleCollectionSelection = function (id) { + if (id in $scope.selectedCollections) { + delete $scope.selectedCollections[id]; } else { - $scope.selectedSubvaults[id] = true; + $scope.selectedCollections[id] = true; } }; - $scope.subvaultSelected = function (subvault) { - return subvault.id in $scope.selectedSubvaults; + $scope.collectionSelected = function (collection) { + return collection.id in $scope.selectedCollections; }; $scope.allSelected = function () { - return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length; + return Object.keys($scope.selectedCollections).length === $scope.collections.length; }; $scope.submit = function () { var request = { - subvaultIds: [] + collectionIds: [] }; - for (var id in $scope.selectedSubvaults) { - if ($scope.selectedSubvaults.hasOwnProperty(id)) { - request.subvaultIds.push(id); + for (var id in $scope.selectedCollections) { + if ($scope.selectedCollections.hasOwnProperty(id)) { + request.collectionIds.push(id); } } - $scope.submitPromise = apiService.ciphers.putSubvaultsAdmin({ id: cipher.id }, request) + $scope.submitPromise = apiService.ciphers.putCollectionsAdmin({ id: cipher.id }, request) .$promise.then(function (response) { - $analytics.eventTrack('Edited Login Subvaults'); + $analytics.eventTrack('Edited Login Collections'); $uibModalInstance.close({ - action: 'subvaultsEdit', - subvaultIds: request.subvaultIds + action: 'collectionsEdit', + collectionIds: request.collectionIds }); }); }; diff --git a/src/app/organization/views/organizationDashboard.html b/src/app/organization/views/organizationDashboard.html index 5ca7355ec6..be3edc186d 100644 --- a/src/app/organization/views/organizationDashboard.html +++ b/src/app/organization/views/organizationDashboard.html @@ -8,7 +8,7 @@

Organization Disabled

- This organization is currently disabled. Users will not see your shared logins or subvaults. + This organization is currently disabled. Users will not see your shared logins or collections. Contact us if you would like to reinstate this organization.

@@ -20,12 +20,12 @@

Let's Get Started!

-

Dashboard features are coming soon. Get started by inviting users and creating your subvaults.

+

Dashboard features are coming soon. Get started by inviting users and creating your collections.

 Invite Users - - Manage Subvaults + + Manage Collections
diff --git a/src/app/organization/views/organizationDelete.html b/src/app/organization/views/organizationDelete.html index 4f4db0d84b..96941a9d31 100644 --- a/src/app/organization/views/organizationDelete.html +++ b/src/app/organization/views/organizationDelete.html @@ -5,7 +5,7 @@

- Continue below to delete this organization and all associated data. This data includes any subvaults and + Continue below to delete this organization and all associated data. This data includes any collections and their associated logins. Individual user accounts will remain, though they will not be associated to this organization anymore.

diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html index ea26aa56d7..8e4cb2cb8f 100644 --- a/src/app/organization/views/organizationPeople.html +++ b/src/app/organization/views/organizationPeople.html @@ -64,8 +64,8 @@ {{user.email}} - +
{{user.name}}
diff --git a/src/app/organization/views/organizationPeopleEdit.html b/src/app/organization/views/organizationPeopleEdit.html index 7de56aa662..3cdb05c9ab 100644 --- a/src/app/organization/views/organizationPeopleEdit.html +++ b/src/app/organization/views/organizationPeopleEdit.html @@ -15,13 +15,13 @@
@@ -31,60 +31,60 @@
-

Subvault Access

+

Collection Access

-
-
- Loading subvaults... +
+
+ Loading collections...
-
-

No subvaults for your organization.

+
+

No collections for your organization.

-
+
- + diff --git a/src/app/organization/views/organizationPeopleInvite.html b/src/app/organization/views/organizationPeopleInvite.html index a55be3a28e..cc06d4bafe 100644 --- a/src/app/organization/views/organizationPeopleInvite.html +++ b/src/app/organization/views/organizationPeopleInvite.html @@ -23,13 +23,13 @@
@@ -39,60 +39,60 @@
-

Subvault Access

+

Collection Access

-
-
- Loading subvaults... +
+
+ Loading collections...
-
-

No subvaults for your organization.

+
+

No collections for your organization.

-
+
+ ng-click="toggleCollectionSelectionAll($event)"> Name Read Only
+ name="selectedCollections[]" + value="{{collection.id}}" + ng-checked="collectionSelected(collection)" + ng-click="toggleCollectionSelection(collection.id)"> - {{subvault.name}} + {{collection.name}} + name="selectedCollectionsReadonly[]" + value="{{collection.id}}" + ng-disabled="!collectionSelected(collection)" + ng-checked="collectionSelected(collection) && selectedCollections[collection.id].readOnly" + ng-click="toggleCollectionReadOnlySelection(collection.id)">
- + diff --git a/src/app/organization/views/organizationSubvaults.html b/src/app/organization/views/organizationSubvaults.html index 680afd7127..4c7f1c731b 100644 --- a/src/app/organization/views/organizationSubvaults.html +++ b/src/app/organization/views/organizationSubvaults.html @@ -1,6 +1,6 @@ 

- Subvaults + Collections share with your organization

@@ -10,33 +10,33 @@  
-
-
+
+
Loading...
-
- No subvaults to list. +
+ No collections to list.
-
-

There are no subvaults yet for your organization.

- +
+

There are no collections yet for your organization.

+
-
+
+ ng-click="toggleCollectionSelectionAll($event)"> Name Read Only
+ name="selectedCollections[]" + value="{{collection.id}}" + ng-checked="collectionSelected(collection)" + ng-click="toggleCollectionSelection(collection.id)"> - {{subvault.name}} + {{collection.name}} + name="selectedCollectionsReadonly[]" + value="{{collection.id}}" + ng-disabled="!collectionSelected(collection)" + ng-checked="collectionSelected(collection) && selectedCollections[collection.id].readOnly" + ng-click="toggleCollectionReadOnlySelection(collection.id)">
- + diff --git a/src/app/organization/views/organizationSubvaultsAdd.html b/src/app/organization/views/organizationSubvaultsAdd.html index 035ab1f506..a7991339a8 100644 --- a/src/app/organization/views/organizationSubvaultsAdd.html +++ b/src/app/organization/views/organizationSubvaultsAdd.html @@ -1,6 +1,6 @@ 
-

Add Subvault

+

Add Collection

@@ -17,9 +17,9 @@

Note

- After creating the subvault, you can associate a user to it by selecting a specific user on the "People" page. + After creating the collection, you can associate a user to it by selecting a specific user on the "People" page.

-

You can associate logins to the subvault by sharing from "My vault".

+

You can associate logins to the collection by sharing from "My vault".

diff --git a/src/app/organization/views/organizationSubvaultsEdit.html b/src/app/organization/views/organizationSubvaultsEdit.html index 7f8986103e..491639387f 100644 --- a/src/app/organization/views/organizationSubvaultsEdit.html +++ b/src/app/organization/views/organizationSubvaultsEdit.html @@ -1,8 +1,8 @@ 
-

Edit Subvault

+

Edit Collection

- +

Errors have occured

@@ -12,15 +12,15 @@
- +

Note

- Select "Users" from the listing options to manage existing users for this subvault. Associate new users by - managing the user's subvault access on the "People" page. + Select "Users" from the listing options to manage existing users for this collection. Associate new users by + managing the user's collection access on the "People" page.

-

You can associate logins to this subvault by sharing from "My vault".

+

You can associate logins to this collection by sharing from "My vault".

diff --git a/src/app/organization/views/organizationSubvaultsGroups.html b/src/app/organization/views/organizationSubvaultsGroups.html index 6c775e3b46..03014dfa55 100644 --- a/src/app/organization/views/organizationSubvaultsGroups.html +++ b/src/app/organization/views/organizationSubvaultsGroups.html @@ -1,6 +1,6 @@ 
-

Groups {{subvault.name}}

+

Groups {{collection.name}}

Groups are coming soon to bitwarden Enterprise organizations. diff --git a/src/app/organization/views/organizationSubvaultsUsers.html b/src/app/organization/views/organizationSubvaultsUsers.html index 68f7e2983c..f7bfcc9e92 100644 --- a/src/app/organization/views/organizationSubvaultsUsers.html +++ b/src/app/organization/views/organizationSubvaultsUsers.html @@ -1,6 +1,6 @@ 
-

User Access {{subvault.name}}

+

User Access {{collection.name}}

@@ -8,7 +8,7 @@

- No users for this subvault. You can associate a new user to this subvault by + No users for this collection. You can associate a new user to this collection by selecting a specific user on the "People" page.

@@ -43,7 +43,7 @@
{{user.name}}
 - - {{subvault.name}} + + {{collection.name}}
- + diff --git a/src/app/organization/views/organizationVault.html b/src/app/organization/views/organizationVault.html index 3fd7cc021d..0f2df3d238 100644 --- a/src/app/organization/views/organizationVault.html +++ b/src/app/organization/views/organizationVault.html @@ -3,37 +3,37 @@ Org Vault , + count="collections.length > 0 ? collections.length - 1 : 0" + when="{'1': '{} collection', 'other': '{} collections'}">,
-

Loading...

-
+

Loading...

+

- - {{subvault.name}} - + + {{collection.name}} +

-
-
No logins in this subvault.
-
No unassigned logins.
-
+
+
No logins in this collection.
+
No unassigned logins.
+
- diff --git a/src/app/organization/views/organizationVaultLoginSubvaults.html b/src/app/organization/views/organizationVaultLoginSubvaults.html index 3f163d4646..9dd9ee1850 100644 --- a/src/app/organization/views/organizationVaultLoginSubvaults.html +++ b/src/app/organization/views/organizationVaultLoginSubvaults.html @@ -1,42 +1,42 @@ 
-

Subvaults {{cipher.name}}

+

Collections {{cipher.name}}

-

Edit the subvaults that this login is being shared with.

+

Edit the collections that this login is being shared with.

Errors have occured

  • {{e}}
-
-

No subvaults to manage.

+
+

No collections to manage.

-
+
@@ -42,13 +42,13 @@
- {{login.name}} + {{login.name}}
{{login.username}}
- + - @@ -44,7 +44,7 @@
- diff --git a/src/app/services/apiService.js b/src/app/services/apiService.js index 6c79246ed5..6743071eeb 100644 --- a/src/app/services/apiService.js +++ b/src/app/services/apiService.js @@ -31,8 +31,8 @@ favorite: { url: _apiUri + '/ciphers/:id/favorite', method: 'POST', params: { id: '@id' } }, putPartial: { url: _apiUri + '/ciphers/:id/partial', method: 'POST', params: { id: '@id' } }, putShare: { url: _apiUri + '/ciphers/:id/share', method: 'POST', params: { id: '@id' } }, - putSubvaults: { url: _apiUri + '/ciphers/:id/subvaults', method: 'POST', params: { id: '@id' } }, - putSubvaultsAdmin: { url: _apiUri + '/ciphers/:id/subvaults-admin', method: 'POST', params: { id: '@id' } }, + putCollections: { url: _apiUri + '/ciphers/:id/collections', method: 'POST', params: { id: '@id' } }, + putCollectionsAdmin: { url: _apiUri + '/ciphers/:id/collections-admin', method: 'POST', params: { id: '@id' } }, del: { url: _apiUri + '/ciphers/:id/delete', method: 'POST', params: { id: '@id' } }, delAdmin: { url: _apiUri + '/ciphers/:id/delete-admin', method: 'POST', params: { id: '@id' } } }); @@ -63,18 +63,18 @@ del: { url: _apiUri + '/organizations/:orgId/users/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } } }); - _service.subvaults = $resource(_apiUri + '/organizations/:orgId/subvaults/:id', {}, { + _service.collections = $resource(_apiUri + '/organizations/:orgId/collections/:id', {}, { get: { method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - listMe: { url: _apiUri + '/subvaults', method: 'GET', params: {} }, + listMe: { url: _apiUri + '/collections', method: 'GET', params: {} }, listOrganization: { method: 'GET', params: { orgId: '@orgId' } }, post: { method: 'POST', params: { orgId: '@orgId' } }, put: { method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - del: { url: _apiUri + '/organizations/:orgId/subvaults/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } } + del: { url: _apiUri + '/organizations/:orgId/collections/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } } }); - _service.subvaultUsers = $resource(_apiUri + '/organizations/:orgId/subvaultUsers/:id', {}, { - listSubvault: { url: _apiUri + '/organizations/:orgId/subvaultUsers/:subvaultId', method: 'GET', params: { subvaultId: '@subvaultId', orgId: '@orgId' } }, - del: { url: _apiUri + '/organizations/:orgId/subvaultUsers/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } } + _service.collectionUsers = $resource(_apiUri + '/organizations/:orgId/collectionUsers/:id', {}, { + listCollection: { url: _apiUri + '/organizations/:orgId/collectionUsers/:collectionId', method: 'GET', params: { collectionId: '@collectionId', orgId: '@orgId' } }, + del: { url: _apiUri + '/organizations/:orgId/collectionUsers/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } } }); _service.accounts = $resource(_apiUri + '/accounts', {}, { diff --git a/src/app/services/cipherService.js b/src/app/services/cipherService.js index ebc7a34a65..c868518663 100644 --- a/src/app/services/cipherService.js +++ b/src/app/services/cipherService.js @@ -26,7 +26,7 @@ angular var login = { id: encryptedLogin.Id, organizationId: encryptedLogin.OrganizationId, - subvaultIds: encryptedLogin.SubvaultIds || [], + collectionIds: encryptedLogin.CollectionIds || [], 'type': 1, folderId: encryptedLogin.FolderId, favorite: encryptedLogin.Favorite, @@ -51,7 +51,7 @@ angular var login = { id: encryptedCipher.Id, organizationId: encryptedCipher.OrganizationId, - subvaultIds: encryptedCipher.SubvaultIds || [], + collectionIds: encryptedCipher.CollectionIds || [], folderId: encryptedCipher.FolderId, favorite: encryptedCipher.Favorite, name: _service.decryptProperty(encryptedCipher.Data.Name, key, false), @@ -90,28 +90,28 @@ angular }; }; - _service.decryptSubvaults = function (encryptedSubvaults, orgId, catchError) { - if (!encryptedSubvaults) throw "encryptedSubvaults is undefined or null"; + _service.decryptCollections = function (encryptedCollections, orgId, catchError) { + if (!encryptedCollections) throw "encryptedCollections is undefined or null"; - var unencryptedSubvaults = []; - for (var i = 0; i < encryptedSubvaults.length; i++) { - unencryptedSubvaults.push(_service.decryptSubvault(encryptedSubvaults[i], orgId, catchError)); + var unencryptedCollections = []; + for (var i = 0; i < encryptedCollections.length; i++) { + unencryptedCollections.push(_service.decryptCollection(encryptedCollections[i], orgId, catchError)); } - return unencryptedSubvaults; + return unencryptedCollections; }; - _service.decryptSubvault = function (encryptedSubvault, orgId, catchError) { - if (!encryptedSubvault) throw "encryptedSubvault is undefined or null"; + _service.decryptCollection = function (encryptedCollection, orgId, catchError) { + if (!encryptedCollection) throw "encryptedCollection is undefined or null"; catchError = catchError === true ? true : false; - orgId = orgId || encryptedSubvault.OrganizationId; + orgId = orgId || encryptedCollection.OrganizationId; var key = cryptoService.getOrgKey(orgId); return { - id: encryptedSubvault.Id, - name: catchError ? _service.decryptProperty(encryptedSubvault.Name, key, false) : - cryptoService.decrypt(encryptedSubvault.Name, key) + id: encryptedCollection.Id, + name: catchError ? _service.decryptProperty(encryptedCollection.Name, key, false) : + cryptoService.decrypt(encryptedCollection.Name, key) }; }; @@ -182,23 +182,23 @@ angular }; }; - _service.encryptSubvaults = function (unencryptedSubvaults, orgId) { - if (!unencryptedSubvaults) throw "unencryptedSubvaults is undefined or null"; + _service.encryptCollections = function (unencryptedCollections, orgId) { + if (!unencryptedCollections) throw "unencryptedCollections is undefined or null"; - var encryptedSubvaults = []; - for (var i = 0; i < unencryptedSubvaults.length; i++) { - encryptedSubvaults.push(_service.encryptSubvault(unencryptedSubvaults[i], orgId)); + var encryptedCollections = []; + for (var i = 0; i < unencryptedCollections.length; i++) { + encryptedCollections.push(_service.encryptCollection(unencryptedCollections[i], orgId)); } - return encryptedSubvaults; + return encryptedCollections; }; - _service.encryptSubvault = function (unencryptedSubvault, orgId) { - if (!unencryptedSubvault) throw "unencryptedSubvault is undefined or null"; + _service.encryptCollection = function (unencryptedCollection, orgId) { + if (!unencryptedCollection) throw "unencryptedCollection is undefined or null"; return { - id: unencryptedSubvault.id, - name: cryptoService.encrypt(unencryptedSubvault.name, cryptoService.getOrgKey(orgId)) + id: unencryptedCollection.id, + name: cryptoService.encrypt(unencryptedCollection.name, cryptoService.getOrgKey(orgId)) }; }; diff --git a/src/app/settings/views/settingsCreateOrganization.html b/src/app/settings/views/settingsCreateOrganization.html index 231cf82d8c..a98af6f9cb 100644 --- a/src/app/settings/views/settingsCreateOrganization.html +++ b/src/app/settings/views/settingsCreateOrganization.html @@ -62,7 +62,7 @@ Free For personal users to share with 1 other user. - Limit 2 users (including you) - - Limit 2 subvaults + - Limit 2 collections Free forever @@ -74,7 +74,7 @@ Personal For personal users such as families & friends. - Add and share with up to 10 users (5 included with base price) - - Create unlimited subvaults + - Create unlimited collections - Priority customer support - 7 day free trial, cancel anytime @@ -89,7 +89,7 @@ Teams For businesses and other team organizations. - Add and share with unlimited users - - Create unlimited subvaults + - Create unlimited collections - Priority customer support - 7 day free trial, cancel anytime diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js index 0d83d6df4b..73706033b0 100644 --- a/src/app/vault/vaultController.js +++ b/src/app/vault/vaultController.js @@ -264,18 +264,18 @@ }); }; - $scope.subvaults = function (login) { + $scope.collections = function (login) { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/vault/views/vaultLoginSubvaults.html', - controller: 'vaultLoginSubvaultsController', + templateUrl: 'app/vault/views/vaultLoginCollections.html', + controller: 'vaultLoginCollectionsController', resolve: { loginId: function () { return login.id; } } }); modal.result.then(function (response) { - if (response.subvaultIds && !response.subvaultIds.length) { + if (response.collectionIds && !response.collectionIds.length) { removeLoginFromScopes(login); } }); diff --git a/src/app/vault/vaultLoginSubvaultsController.js b/src/app/vault/vaultLoginSubvaultsController.js index e9ba59b3f8..65dbd91bac 100644 --- a/src/app/vault/vaultLoginSubvaultsController.js +++ b/src/app/vault/vaultLoginSubvaultsController.js @@ -1,15 +1,15 @@ angular .module('bit.vault') - .controller('vaultLoginSubvaultsController', function ($scope, apiService, $uibModalInstance, cipherService, + .controller('vaultLoginCollectionsController', function ($scope, apiService, $uibModalInstance, cipherService, loginId, $analytics) { - $analytics.eventTrack('vaultLoginSubvaultsController', { category: 'Modal' }); + $analytics.eventTrack('vaultLoginCollectionsController', { category: 'Modal' }); $scope.login = {}; $scope.readOnly = false; $scope.loadingLogin = true; - $scope.loadingSubvaults = true; - $scope.selectedSubvaults = {}; - $scope.subvaults = []; + $scope.loadingCollections = true; + $scope.selectedCollections = {}; + $scope.collections = []; $uibModalInstance.opened.then(function () { apiService.ciphers.getFullDetails({ id: loginId }).$promise.then(function (cipher) { @@ -21,13 +21,13 @@ $scope.login = cipherService.decryptLoginPreview(cipher); } - var subvaults = {}; - if (cipher.SubvaultIds) { - for (var i = 0; i < cipher.SubvaultIds.length; i++) { - subvaults[cipher.SubvaultIds[i]] = true; + var collections = {}; + if (cipher.CollectionIds) { + for (var i = 0; i < cipher.CollectionIds.length; i++) { + collections[cipher.CollectionIds[i]] = true; } } - $scope.selectedSubvaults = subvaults; + $scope.selectedCollections = collections; return cipher; } @@ -35,72 +35,72 @@ return null; }).then(function (cipher) { if (!cipher) { - $scope.loadingSubvaults = false; + $scope.loadingCollections = false; return; } - apiService.subvaults.listMe(function (response) { - var subvaults = []; + apiService.collections.listMe(function (response) { + var collections = []; for (var i = 0; i < response.Data.length; i++) { if (response.Data[i].OrganizationId !== cipher.OrganizationId) { continue; } - var decSubvault = cipherService.decryptSubvault(response.Data[i]); - subvaults.push(decSubvault); + var decCollection = cipherService.decryptCollection(response.Data[i]); + collections.push(decCollection); } - $scope.loadingSubvaults = false; - $scope.subvaults = subvaults; + $scope.loadingCollections = false; + $scope.collections = collections; }); }); }); - $scope.toggleSubvaultSelectionAll = function ($event) { - var subvaults = {}; + $scope.toggleCollectionSelectionAll = function ($event) { + var collections = {}; if ($event.target.checked) { - for (var i = 0; i < $scope.subvaults.length; i++) { - subvaults[$scope.subvaults[i].id] = true; + for (var i = 0; i < $scope.collections.length; i++) { + collections[$scope.collections[i].id] = true; } } - $scope.selectedSubvaults = subvaults; + $scope.selectedCollections = collections; }; - $scope.toggleSubvaultSelection = function (id) { - if (id in $scope.selectedSubvaults) { - delete $scope.selectedSubvaults[id]; + $scope.toggleCollectionSelection = function (id) { + if (id in $scope.selectedCollections) { + delete $scope.selectedCollections[id]; } else { - $scope.selectedSubvaults[id] = true; + $scope.selectedCollections[id] = true; } }; - $scope.subvaultSelected = function (subvault) { - return subvault.id in $scope.selectedSubvaults; + $scope.collectionSelected = function (collection) { + return collection.id in $scope.selectedCollections; }; $scope.allSelected = function () { - return Object.keys($scope.selectedSubvaults).length === $scope.subvaults.length; + return Object.keys($scope.selectedCollections).length === $scope.collections.length; }; $scope.submit = function () { var request = { - subvaultIds: [] + collectionIds: [] }; - for (var id in $scope.selectedSubvaults) { - if ($scope.selectedSubvaults.hasOwnProperty(id)) { - request.subvaultIds.push(id); + for (var id in $scope.selectedCollections) { + if ($scope.selectedCollections.hasOwnProperty(id)) { + request.collectionIds.push(id); } } - $scope.submitPromise = apiService.ciphers.putSubvaults({ id: loginId }, request) + $scope.submitPromise = apiService.ciphers.putCollections({ id: loginId }, request) .$promise.then(function (response) { - $analytics.eventTrack('Edited Login Subvaults'); + $analytics.eventTrack('Edited Login Collections'); $uibModalInstance.close({ - action: 'subvaultsEdit', - subvaultIds: request.subvaultIds + action: 'collectionsEdit', + collectionIds: request.collectionIds }); }); }; diff --git a/src/app/vault/vaultShareController.js b/src/app/vault/vaultShareController.js index 3af82bf942..db7d30ff0b 100644 --- a/src/app/vault/vaultShareController.js +++ b/src/app/vault/vaultShareController.js @@ -6,11 +6,11 @@ $analytics.eventTrack('vaultShareController', { category: 'Modal' }); $scope.model = {}; $scope.login = {}; - $scope.subvaults = []; - $scope.selectedSubvaults = {}; + $scope.collections = []; + $scope.selectedCollections = {}; $scope.organizations = []; - var organizationSubvaultCounts = {}; - $scope.loadingSubvaults = true; + var organizationCollectionCounts = {}; + $scope.loadingCollections = true; $scope.readOnly = false; apiService.logins.get({ id: loginId }).$promise.then(function (login) { @@ -38,7 +38,7 @@ name: profile.organizations[i].name }); - organizationSubvaultCounts[profile.organizations[i].id] = 0; + organizationCollectionCounts[profile.organizations[i].id] = 0; if (!setFirstOrg) { setFirstOrg = true; @@ -49,45 +49,45 @@ $scope.organizations = orgs; - apiService.subvaults.listMe(function (response) { - var subvaults = []; + apiService.collections.listMe(function (response) { + var collections = []; for (var i = 0; i < response.Data.length; i++) { - var decSubvault = cipherService.decryptSubvault(response.Data[i]); - decSubvault.organizationId = response.Data[i].OrganizationId; - subvaults.push(decSubvault); - organizationSubvaultCounts[decSubvault.organizationId]++; + var decCollection = cipherService.decryptCollection(response.Data[i]); + decCollection.organizationId = response.Data[i].OrganizationId; + collections.push(decCollection); + organizationCollectionCounts[decCollection.organizationId]++; } - $scope.subvaults = subvaults; - $scope.loadingSubvaults = false; + $scope.collections = collections; + $scope.loadingCollections = false; }); } }); - $scope.toggleSubvaultSelectionAll = function ($event) { - var subvaults = {}; + $scope.toggleCollectionSelectionAll = function ($event) { + var collections = {}; if ($event.target.checked) { - for (var i = 0; i < $scope.subvaults.length; i++) { - if ($scope.model.organizationId && $scope.subvaults[i].organizationId === $scope.model.organizationId) { - subvaults[$scope.subvaults[i].id] = true; + for (var i = 0; i < $scope.collections.length; i++) { + if ($scope.model.organizationId && $scope.collections[i].organizationId === $scope.model.organizationId) { + collections[$scope.collections[i].id] = true; } } } - $scope.selectedSubvaults = subvaults; + $scope.selectedCollections = collections; }; - $scope.toggleSubvaultSelection = function (id) { - if (id in $scope.selectedSubvaults) { - delete $scope.selectedSubvaults[id]; + $scope.toggleCollectionSelection = function (id) { + if (id in $scope.selectedCollections) { + delete $scope.selectedCollections[id]; } else { - $scope.selectedSubvaults[id] = true; + $scope.selectedCollections[id] = true; } }; - $scope.subvaultSelected = function (subvault) { - return subvault.id in $scope.selectedSubvaults; + $scope.collectionSelected = function (collection) { + return collection.id in $scope.selectedCollections; }; $scope.allSelected = function () { @@ -95,11 +95,11 @@ return false; } - return Object.keys($scope.selectedSubvaults).length === organizationSubvaultCounts[$scope.model.organizationId]; + return Object.keys($scope.selectedCollections).length === organizationCollectionCounts[$scope.model.organizationId]; }; $scope.orgChanged = function () { - $scope.selectedSubvaults = {}; + $scope.selectedCollections = {}; }; $scope.submitPromise = null; @@ -107,13 +107,13 @@ $scope.login.organizationId = model.organizationId; var request = { - subvaultIds: [], + collectionIds: [], cipher: cipherService.encryptLogin($scope.login) }; - for (var id in $scope.selectedSubvaults) { - if ($scope.selectedSubvaults.hasOwnProperty(id)) { - request.subvaultIds.push(id); + for (var id in $scope.selectedCollections) { + if ($scope.selectedCollections.hasOwnProperty(id)) { + request.collectionIds.push(id); } } diff --git a/src/app/vault/vaultSubvaultsController.js b/src/app/vault/vaultSubvaultsController.js index 25b6fb4fed..a554001853 100644 --- a/src/app/vault/vaultSubvaultsController.js +++ b/src/app/vault/vaultSubvaultsController.js @@ -1,24 +1,24 @@ angular .module('bit.vault') - .controller('vaultSubvaultsController', function ($scope, apiService, cipherService, $analytics, $q, $localStorage, + .controller('vaultCollectionsController', function ($scope, apiService, cipherService, $analytics, $q, $localStorage, $uibModal, $filter, $rootScope) { $scope.logins = []; - $scope.subvaults = []; + $scope.collections = []; $scope.loading = true; $scope.$on('$viewContentLoaded', function () { - var subvaultPromise = apiService.subvaults.listMe({}, function (subvaults) { - var decSubvaults = []; + var collectionPromise = apiService.collections.listMe({}, function (collections) { + var decCollections = []; - for (var i = 0; i < subvaults.Data.length; i++) { - var decSubvault = cipherService.decryptSubvault(subvaults.Data[i], null, true); - decSubvault.collapsed = $localStorage.collapsedSubvaults && - decSubvault.id in $localStorage.collapsedSubvaults; - decSubvaults.push(decSubvault); + for (var i = 0; i < collections.Data.length; i++) { + var decCollection = cipherService.decryptCollection(collections.Data[i], null, true); + decCollection.collapsed = $localStorage.collapsedCollections && + decCollection.id in $localStorage.collapsedCollections; + decCollections.push(decCollection); } - $scope.subvaults = decSubvaults; + $scope.collections = decCollections; }).$promise; var cipherPromise = apiService.ciphers.listDetails({}, function (ciphers) { @@ -34,27 +34,27 @@ $scope.logins = decLogins; }).$promise; - $q.all([subvaultPromise, cipherPromise]).then(function () { + $q.all([collectionPromise, cipherPromise]).then(function () { $scope.loading = false; }); }); - $scope.filterBySubvault = function (subvault) { + $scope.filterByCollection = function (collection) { return function (cipher) { - return cipher.subvaultIds.indexOf(subvault.id) > -1; + return cipher.collectionIds.indexOf(collection.id) > -1; }; }; - $scope.collapseExpand = function (subvault) { - if (!$localStorage.collapsedSubvaults) { - $localStorage.collapsedSubvaults = {}; + $scope.collapseExpand = function (collection) { + if (!$localStorage.collapsedCollections) { + $localStorage.collapsedCollections = {}; } - if (subvault.id in $localStorage.collapsedSubvaults) { - delete $localStorage.collapsedSubvaults[subvault.id]; + if (collection.id in $localStorage.collapsedCollections) { + delete $localStorage.collapsedCollections[collection.id]; } else { - $localStorage.collapsedSubvaults[subvault.id] = true; + $localStorage.collapsedCollections[collection.id] = true; } }; @@ -92,47 +92,47 @@ }); }; - $scope.editSubvaults = function (login) { + $scope.editCollections = function (login) { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/vault/views/vaultLoginSubvaults.html', - controller: 'vaultLoginSubvaultsController', + templateUrl: 'app/vault/views/vaultLoginCollections.html', + controller: 'vaultLoginCollectionsController', resolve: { loginId: function () { return login.id; } } }); modal.result.then(function (response) { - if (response.subvaultIds) { - login.subvaultIds = response.subvaultIds; + if (response.collectionIds) { + login.collectionIds = response.collectionIds; - if (!response.subvaultIds.length) { + if (!response.collectionIds.length) { removeRootLogin(findRootLogin(login)); } } }); }; - $scope.removeLogin = function (login, subvault) { + $scope.removeLogin = function (login, collection) { if (!confirm('Are you sure you want to remove this login (' + login.name + ') from the ' + - 'subvault (' + subvault.name + ') ?')) { + 'collection (' + collection.name + ') ?')) { return; } var request = { - subvaultIds: [] + collectionIds: [] }; - for (var i = 0; i < login.subvaultIds.length; i++) { - if (login.subvaultIds[i] !== subvault.id) { - request.subvaultIds.push(login.subvaultIds[i]); + for (var i = 0; i < login.collectionIds.length; i++) { + if (login.collectionIds[i] !== collection.id) { + request.collectionIds.push(login.collectionIds[i]); } } - apiService.ciphers.putSubvaults({ id: login.id }, request).$promise.then(function (response) { - $analytics.eventTrack('Removed From Subvault'); - login.subvaultIds = request.subvaultIds; - if (!login.subvaultIds.length) { + apiService.ciphers.putCollections({ id: login.id }, request).$promise.then(function (response) { + $analytics.eventTrack('Removed From Collection'); + login.collectionIds = request.collectionIds; + if (!login.collectionIds.length) { removeRootLogin(findRootLogin(login)); } }); diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html index 3ac8176dd6..2523bc6fd8 100644 --- a/src/app/vault/views/vault.html +++ b/src/app/vault/views/vault.html @@ -67,8 +67,8 @@
  • - - Subvaults + + Collections
  • @@ -154,8 +154,8 @@
  • - - Subvaults + + Collections
  • diff --git a/src/app/vault/views/vaultLoginSubvaults.html b/src/app/vault/views/vaultLoginSubvaults.html index 3f1118eb76..88c614a2d2 100644 --- a/src/app/vault/views/vaultLoginSubvaults.html +++ b/src/app/vault/views/vaultLoginSubvaults.html @@ -1,45 +1,45 @@ 
    -

    Subvaults {{login.name}}

    +

    Collections {{login.name}}

    -

    Edit the subvaults that this login is being shared with.

    +

    Edit the collections that this login is being shared with.

    Errors have occured

    • {{e}}
    -
    +
    Loading...
    -
    -

    No subvaults to manage.

    +
    +

    No collections to manage.

    -
    +
    • + ng-click="toggleCollectionSelectionAll($event)"> Name
    + name="selectedCollections[]" + value="{{collection.id}}" + ng-checked="collectionSelected(collection)" + ng-click="toggleCollectionSelection(collection.id)"> - {{subvault.name}} + + {{collection.name}}
    - + - @@ -47,7 +47,7 @@
    - diff --git a/src/app/vault/views/vaultShare.html b/src/app/vault/views/vaultShare.html index 36c48c9ddc..f341bfcc08 100644 --- a/src/app/vault/views/vaultShare.html +++ b/src/app/vault/views/vaultShare.html @@ -26,38 +26,38 @@
    -

    Subvault Access

    -
    +

    Collection Access

    +

    Loading...

    -
    -

    No Subvaults

    -

    You do not have write access to any subvaults for this organization.

    +
    +

    No Collections

    +

    You do not have write access to any collections for this organization.

    -
    +
    + ng-click="toggleCollectionSelectionAll($event)"> Name
    + name="selectedCollections[]" + value="{{collection.id}}" + ng-checked="collectionSelected(collection)" + ng-click="toggleCollectionSelection(collection.id)"> - {{subvault.name}} + + {{collection.name}}
    - + - diff --git a/src/app/vault/views/vaultSubvaults.html b/src/app/vault/views/vaultSubvaults.html index b0b4cd230e..32f0884b3a 100644 --- a/src/app/vault/views/vaultSubvaults.html +++ b/src/app/vault/views/vaultSubvaults.html @@ -1,57 +1,57 @@ 

    - Subvaults + Collections - , + ,

    -
    +

    Loading...

    -
    -

    No Subvaults

    +
    +

    No Collections

    - You do not have any subvaults being shared with you. + You do not have any collections being shared with you.

    - Subvaults allow you to share logins with other bitwarden users. To start using subvaults create an organization or + Collections allow you to share logins with other bitwarden users. To start using collections create an organization or ask an existing organization to invite you.

    Create an Organization
    -
    +

    - {{subvault.name}} - + {{collection.name}} +

    -
    -
    -

    No logins in this subvault.

    +
    +
    +

    No logins in this collection.

    - Share a login to this subvault by selecting Share or - Subvaults from the login's options () menu. + Share a login to this collection by selecting Share or + Collections from the login's options () menu.

    -
    +
    + ng-click="toggleCollectionSelectionAll($event)"> Name
    + name="selectedCollections[]" + value="{{collection.id}}" + ng-checked="collectionSelected(collection)" + ng-click="toggleCollectionSelection(collection.id)"> - {{subvault.name}} + + {{collection.name}}
    -
    @@ -65,12 +65,12 @@
  • - - Subvaults + + Collections
  • - + Remove
    • diff --git a/src/app/views/organizationLayout.html b/src/app/views/organizationLayout.html index c50cb2452b..d8623dca1b 100644 --- a/src/app/views/organizationLayout.html +++ b/src/app/views/organizationLayout.html @@ -41,9 +41,9 @@ Vault -
  • - - Subvaults +
  • + + Collections
  • diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html index b9dfe04734..1325cb5839 100644 --- a/src/app/views/userLayout.html +++ b/src/app/views/userLayout.html @@ -54,11 +54,11 @@
    • -
  • - +
  • + NEW - Subvaults + Collections
  • diff --git a/src/index.html b/src/index.html index fd966efe20..5b4941aefc 100644 --- a/src/index.html +++ b/src/index.html @@ -126,18 +126,18 @@ - - + + - - - - + + + + @@ -145,9 +145,9 @@ - + - +