bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-15 15:53:18 +00:00
Code Issues Releases Wiki Activity

move logins to ciphers apis

Browse Source
This commit is contained in:
Kyle Spearrin
2017-09-20 16:45:13 -04:00
parent 06a877c755
commit f7fbdf2081
12 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/organization/organizationVaultAddLoginController.js
View File

@@ -16,7 +16,7 @@
$scope.save = function (model) { $scope.save = function (model) {
model.organizationId = orgId; model.organizationId = orgId;
var login = cipherService.encryptLogin(model); var login = cipherService.encryptLogin(model);
$scope.savePromise = apiService.logins.postAdmin(login, function (loginResponse) { $scope.savePromise = apiService.ciphers.postAdmin(login, function (loginResponse) {
$analytics.eventTrack('Created Organization Login'); $analytics.eventTrack('Created Organization Login');
var decLogin = cipherService.decryptLogin(loginResponse); var decLogin = cipherService.decryptLogin(loginResponse);
$uibModalInstance.close(decLogin); $uibModalInstance.close(decLogin);

2
src/app/organization/organizationVaultAttachmentsController.js
View File

@@ -10,7 +10,7 @@
$scope.canUseAttachments = true; $scope.canUseAttachments = true;
var closing = false; var closing = false;
apiService.logins.getAdmin({ id: loginId }, function (login) { apiService.ciphers.getAdmin({ id: loginId }, function (login) {
$scope.login = cipherService.decryptLogin(login); $scope.login = cipherService.decryptLogin(login);
$scope.loading = false; $scope.loading = false;
}, function () { }, function () {

4
src/app/organization/organizationVaultEditLoginController.js
View File

@@ -7,14 +7,14 @@
$scope.login = {}; $scope.login = {};
$scope.hideFolders = $scope.hideFavorite = $scope.fromOrg = true; $scope.hideFolders = $scope.hideFavorite = $scope.fromOrg = true;
apiService.logins.getAdmin({ id: loginId }, function (login) { apiService.ciphers.getAdmin({ id: loginId }, function (login) {
$scope.login = cipherService.decryptLogin(login); $scope.login = cipherService.decryptLogin(login);
$scope.useTotp = $scope.login.organizationUseTotp; $scope.useTotp = $scope.login.organizationUseTotp;
}); });
$scope.save = function (model) { $scope.save = function (model) {
var login = cipherService.encryptLogin(model); var login = cipherService.encryptLogin(model);
$scope.savePromise = apiService.logins.putAdmin({ id: loginId }, login, function (loginResponse) { $scope.savePromise = apiService.ciphers.putAdmin({ id: loginId }, login, function (loginResponse) {
$analytics.eventTrack('Edited Organization Login'); $analytics.eventTrack('Edited Organization Login');
var decLogin = cipherService.decryptLogin(loginResponse); var decLogin = cipherService.decryptLogin(loginResponse);
$uibModalInstance.close({ $uibModalInstance.close({

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

@@ -6,17 +6,6 @@
_apiUri = appSettings.apiUri, _apiUri = appSettings.apiUri,
_identityUri = appSettings.identityUri; _identityUri = appSettings.identityUri;
_service.logins = $resource(_apiUri + '/logins/:id', {}, {
get: { method: 'GET', params: { id: '@id' } },
getAdmin: { url: _apiUri + '/logins/:id/admin', method: 'GET', params: { id: '@id' } },
list: { method: 'GET', params: {} },
post: { method: 'POST', params: {} },
postAdmin: { url: _apiUri + '/logins/admin', method: 'POST', params: {} },
put: { method: 'POST', params: { id: '@id' } },
putAdmin: { url: _apiUri + '/logins/:id/admin', method: 'POST', params: { id: '@id' } },
del: { url: _apiUri + '/logins/:id/delete', method: 'POST', params: { id: '@id' } }
});
_service.folders = $resource(_apiUri + '/folders/:id', {}, { _service.folders = $resource(_apiUri + '/folders/:id', {}, {
get: { method: 'GET', params: { id: '@id' } }, get: { method: 'GET', params: { id: '@id' } },
list: { method: 'GET', params: {} }, list: { method: 'GET', params: {} },
@@ -27,13 +16,17 @@
_service.ciphers = $resource(_apiUri + '/ciphers/:id', {}, { _service.ciphers = $resource(_apiUri + '/ciphers/:id', {}, {
get: { method: 'GET', params: { id: '@id' } }, get: { method: 'GET', params: { id: '@id' } },
getAdmin: { url: _apiUri + '/ciphers/:id/admin', method: 'GET', params: { id: '@id' } },
getDetails: { url: _apiUri + '/ciphers/:id/details', method: 'GET', params: { id: '@id' } }, getDetails: { url: _apiUri + '/ciphers/:id/details', method: 'GET', params: { id: '@id' } },
list: { method: 'GET', params: {} }, list: { method: 'GET', params: {} },
listDetails: { url: _apiUri + '/ciphers/details', method: 'GET', params: {} }, listDetails: { url: _apiUri + '/ciphers/details', method: 'GET', params: {} },
listOrganizationDetails: { url: _apiUri + '/ciphers/organization-details', method: 'GET', params: {} }, listOrganizationDetails: { url: _apiUri + '/ciphers/organization-details', method: 'GET', params: {} },
post: { method: 'POST', params: {} },
postAdmin: { url: _apiUri + '/ciphers/admin', method: 'POST', params: {} },
put: { method: 'POST', params: { id: '@id' } },
putAdmin: { url: _apiUri + '/ciphers/:id/admin', method: 'POST', params: { id: '@id' } },
'import': { url: _apiUri + '/ciphers/import', method: 'POST', params: {} }, 'import': { url: _apiUri + '/ciphers/import', method: 'POST', params: {} },
importOrg: { url: _apiUri + '/ciphers/import-organization?organizationId=:orgId', method: 'POST', params: { orgId: '@orgId' } }, importOrg: { url: _apiUri + '/ciphers/import-organization?organizationId=:orgId', method: 'POST', params: { orgId: '@orgId' } },
favorite: { url: _apiUri + '/ciphers/:id/favorite', method: 'POST', params: { id: '@id' } },
putPartial: { url: _apiUri + '/ciphers/:id/partial', 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' } }, putShare: { url: _apiUri + '/ciphers/:id/share', method: 'POST', params: { id: '@id' } },
putCollections: { url: _apiUri + '/ciphers/:id/collections', method: 'POST', params: { id: '@id' } }, putCollections: { url: _apiUri + '/ciphers/:id/collections', method: 'POST', params: { id: '@id' } },

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

@@ -35,7 +35,7 @@ angular
attachments: null attachments: null
}; };
var loginData = encryptedLogin.Data || encryptedLogin; var loginData = encryptedLogin.Data;
if (loginData) { if (loginData) {
login.name = cryptoService.decrypt(loginData.Name, key); login.name = cryptoService.decrypt(loginData.Name, key);
login.uri = loginData.Uri && loginData.Uri !== '' ? cryptoService.decrypt(loginData.Uri, key) : null; login.uri = loginData.Uri && loginData.Uri !== '' ? cryptoService.decrypt(loginData.Uri, key) : null;
@@ -76,7 +76,7 @@ angular
hasAttachments: !!encryptedCipher.Attachments && encryptedCipher.Attachments.length > 0 hasAttachments: !!encryptedCipher.Attachments && encryptedCipher.Attachments.length > 0
}; };
var loginData = encryptedCipher.Data || encryptedCipher; var loginData = encryptedCipher.Data;
if (loginData) { if (loginData) {
login.name = _service.decryptProperty(loginData.Name, key, false); login.name = _service.decryptProperty(loginData.Name, key, false);
login.username = _service.decryptProperty(loginData.Username, key, true); login.username = _service.decryptProperty(loginData.Username, key, true);

2
src/app/settings/settingsUpdateKeyController.js
View File

@@ -32,7 +32,7 @@
var madeEncKey = cryptoService.makeEncKey(null); var madeEncKey = cryptoService.makeEncKey(null);
var reencryptedLogins = []; var reencryptedLogins = [];
var loginsPromise = apiService.logins.list({}, function (encryptedLogins) { var loginsPromise = apiService.ciphers.list({}, function (encryptedLogins) {
var filteredEncryptedLogins = []; var filteredEncryptedLogins = [];
for (var i = 0; i < encryptedLogins.Data.length; i++) { for (var i = 0; i < encryptedLogins.Data.length; i++) {
if (encryptedLogins.Data[i].OrganizationId) { if (encryptedLogins.Data[i].OrganizationId) {

2
src/app/tools/toolsExportController.js
View File

@@ -13,7 +13,7 @@
decFolders = cipherService.decryptFolders(folders.Data); decFolders = cipherService.decryptFolders(folders.Data);
}).$promise; }).$promise;
var loginsPromise = apiService.logins.list({}, function (logins) { var loginsPromise = apiService.ciphers.list({}, function (logins) {
decLogins = cipherService.decryptLogins(logins.Data); decLogins = cipherService.decryptLogins(logins.Data);
}).$promise; }).$promise;

2
src/app/vault/vaultAddLoginController.js
View File

@@ -17,7 +17,7 @@
$scope.savePromise = null; $scope.savePromise = null;
$scope.save = function (model) { $scope.save = function (model) {
var login = cipherService.encryptLogin(model); var login = cipherService.encryptLogin(model);
$scope.savePromise = apiService.logins.post(login, function (loginResponse) { $scope.savePromise = apiService.ciphers.post(login, function (loginResponse) {
$analytics.eventTrack('Created Login'); $analytics.eventTrack('Created Login');
var decLogin = cipherService.decryptLogin(loginResponse); var decLogin = cipherService.decryptLogin(loginResponse);
$uibModalInstance.close(decLogin); $uibModalInstance.close(decLogin);

8
src/app/vault/vaultAttachmentsController.js
View File

@@ -13,10 +13,10 @@
authService.getUserProfile().then(function (profile) { authService.getUserProfile().then(function (profile) {
$scope.isPremium = profile.premium; $scope.isPremium = profile.premium;
return apiService.logins.get({ id: loginId }).$promise; return apiService.ciphers.get({ id: loginId }).$promise;
}).then(function (login) { }).then(function (cipher) {
$scope.login = cipherService.decryptLogin(login); $scope.login = cipherService.decryptLogin(cipher);
$scope.readOnly = !login.Edit; $scope.readOnly = !$scope.login.edit;
$scope.canUseAttachments = $scope.isPremium || $scope.login.organizationId; $scope.canUseAttachments = $scope.isPremium || $scope.login.organizationId;
$scope.loading = false; $scope.loading = false;
}, function () { }, function () {

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

@@ -193,7 +193,7 @@
return; return;
} }
apiService.logins.del({ id: login.id }, function () { apiService.ciphers.del({ id: login.id }, function () {
$analytics.eventTrack('Deleted Login'); $analytics.eventTrack('Deleted Login');
removeLoginFromScopes(login); removeLoginFromScopes(login);
}); });

8
src/app/vault/vaultEditLoginController.js
View File

@@ -10,10 +10,10 @@
authService.getUserProfile().then(function (profile) { authService.getUserProfile().then(function (profile) {
$scope.useTotp = profile.premium; $scope.useTotp = profile.premium;
return apiService.logins.get({ id: loginId }).$promise; return apiService.ciphers.get({ id: loginId }).$promise;
}).then(function (login) { }).then(function (login) {
$scope.login = cipherService.decryptLogin(login); $scope.login = cipherService.decryptLogin(login);
$scope.readOnly = !login.Edit; $scope.readOnly = !$scope.login.edit;
$scope.useTotp = $scope.useTotp || $scope.login.organizationUseTotp; $scope.useTotp = $scope.useTotp || $scope.login.organizationUseTotp;
}); });
@@ -36,7 +36,7 @@
} }
else { else {
var login = cipherService.encryptLogin(model); var login = cipherService.encryptLogin(model);
$scope.savePromise = apiService.logins.put({ id: loginId }, login, function (loginResponse) { $scope.savePromise = apiService.ciphers.put({ id: loginId }, login, function (loginResponse) {
$analytics.eventTrack('Edited Login'); $analytics.eventTrack('Edited Login');
var decLogin = cipherService.decryptLogin(loginResponse); var decLogin = cipherService.decryptLogin(loginResponse);
$uibModalInstance.close({ $uibModalInstance.close({
@@ -86,7 +86,7 @@
return; return;
} }
apiService.logins.del({ id: $scope.login.id }, function () { apiService.ciphers.del({ id: $scope.login.id }, function () {
$analytics.eventTrack('Deleted Login From Edit'); $analytics.eventTrack('Deleted Login From Edit');
$uibModalInstance.close({ $uibModalInstance.close({
action: 'delete', action: 'delete',

2
src/app/vault/vaultShareLoginController.js
View File

@@ -14,7 +14,7 @@
$scope.loading = true; $scope.loading = true;
$scope.readOnly = false; $scope.readOnly = false;
apiService.logins.get({ id: loginId }).$promise.then(function (login) { apiService.ciphers.get({ id: loginId }).$promise.then(function (login) {
$scope.readOnly = !login.Edit; $scope.readOnly = !login.Edit;
if (login.Edit) { if (login.Edit) {
$scope.login = cipherService.decryptLogin(login); $scope.login = cipherService.decryptLogin(login);