From f7fbdf2081e2535d28b761c052980634dce1fd4e Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 20 Sep 2017 16:45:13 -0400 Subject: [PATCH] move logins to ciphers apis --- .../organizationVaultAddLoginController.js | 2 +- .../organizationVaultAttachmentsController.js | 2 +- .../organizationVaultEditLoginController.js | 4 ++-- src/app/services/apiService.js | 17 +++++------------ src/app/services/cipherService.js | 4 ++-- src/app/settings/settingsUpdateKeyController.js | 2 +- src/app/tools/toolsExportController.js | 2 +- src/app/vault/vaultAddLoginController.js | 2 +- src/app/vault/vaultAttachmentsController.js | 8 ++++---- src/app/vault/vaultController.js | 2 +- src/app/vault/vaultEditLoginController.js | 8 ++++---- src/app/vault/vaultShareLoginController.js | 2 +- 12 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/app/organization/organizationVaultAddLoginController.js b/src/app/organization/organizationVaultAddLoginController.js index de4828e123..12a64d78cf 100644 --- a/src/app/organization/organizationVaultAddLoginController.js +++ b/src/app/organization/organizationVaultAddLoginController.js @@ -16,7 +16,7 @@ $scope.save = function (model) { model.organizationId = orgId; 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'); var decLogin = cipherService.decryptLogin(loginResponse); $uibModalInstance.close(decLogin); diff --git a/src/app/organization/organizationVaultAttachmentsController.js b/src/app/organization/organizationVaultAttachmentsController.js index eef3b12613..c0163feeb2 100644 --- a/src/app/organization/organizationVaultAttachmentsController.js +++ b/src/app/organization/organizationVaultAttachmentsController.js @@ -10,7 +10,7 @@ $scope.canUseAttachments = true; var closing = false; - apiService.logins.getAdmin({ id: loginId }, function (login) { + apiService.ciphers.getAdmin({ id: loginId }, function (login) { $scope.login = cipherService.decryptLogin(login); $scope.loading = false; }, function () { diff --git a/src/app/organization/organizationVaultEditLoginController.js b/src/app/organization/organizationVaultEditLoginController.js index efdd017bcf..3097eb367c 100644 --- a/src/app/organization/organizationVaultEditLoginController.js +++ b/src/app/organization/organizationVaultEditLoginController.js @@ -7,14 +7,14 @@ $scope.login = {}; $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.useTotp = $scope.login.organizationUseTotp; }); $scope.save = function (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'); var decLogin = cipherService.decryptLogin(loginResponse); $uibModalInstance.close({ diff --git a/src/app/services/apiService.js b/src/app/services/apiService.js index e339a59f1a..d87dea536c 100644 --- a/src/app/services/apiService.js +++ b/src/app/services/apiService.js @@ -6,17 +6,6 @@ _apiUri = appSettings.apiUri, _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', {}, { get: { method: 'GET', params: { id: '@id' } }, list: { method: 'GET', params: {} }, @@ -27,13 +16,17 @@ _service.ciphers = $resource(_apiUri + '/ciphers/: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' } }, list: { method: 'GET', params: {} }, listDetails: { url: _apiUri + '/ciphers/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: {} }, 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' } }, putShare: { url: _apiUri + '/ciphers/:id/share', method: 'POST', params: { id: '@id' } }, putCollections: { url: _apiUri + '/ciphers/:id/collections', method: 'POST', params: { id: '@id' } }, diff --git a/src/app/services/cipherService.js b/src/app/services/cipherService.js index b2c98ae8c0..a7ca279725 100644 --- a/src/app/services/cipherService.js +++ b/src/app/services/cipherService.js @@ -35,7 +35,7 @@ angular attachments: null }; - var loginData = encryptedLogin.Data || encryptedLogin; + var loginData = encryptedLogin.Data; if (loginData) { login.name = cryptoService.decrypt(loginData.Name, key); login.uri = loginData.Uri && loginData.Uri !== '' ? cryptoService.decrypt(loginData.Uri, key) : null; @@ -76,7 +76,7 @@ angular hasAttachments: !!encryptedCipher.Attachments && encryptedCipher.Attachments.length > 0 }; - var loginData = encryptedCipher.Data || encryptedCipher; + var loginData = encryptedCipher.Data; if (loginData) { login.name = _service.decryptProperty(loginData.Name, key, false); login.username = _service.decryptProperty(loginData.Username, key, true); diff --git a/src/app/settings/settingsUpdateKeyController.js b/src/app/settings/settingsUpdateKeyController.js index b05bf85264..e72d8001b3 100644 --- a/src/app/settings/settingsUpdateKeyController.js +++ b/src/app/settings/settingsUpdateKeyController.js @@ -32,7 +32,7 @@ var madeEncKey = cryptoService.makeEncKey(null); var reencryptedLogins = []; - var loginsPromise = apiService.logins.list({}, function (encryptedLogins) { + var loginsPromise = apiService.ciphers.list({}, function (encryptedLogins) { var filteredEncryptedLogins = []; for (var i = 0; i < encryptedLogins.Data.length; i++) { if (encryptedLogins.Data[i].OrganizationId) { diff --git a/src/app/tools/toolsExportController.js b/src/app/tools/toolsExportController.js index 8000c18513..9810de3b24 100644 --- a/src/app/tools/toolsExportController.js +++ b/src/app/tools/toolsExportController.js @@ -13,7 +13,7 @@ decFolders = cipherService.decryptFolders(folders.Data); }).$promise; - var loginsPromise = apiService.logins.list({}, function (logins) { + var loginsPromise = apiService.ciphers.list({}, function (logins) { decLogins = cipherService.decryptLogins(logins.Data); }).$promise; diff --git a/src/app/vault/vaultAddLoginController.js b/src/app/vault/vaultAddLoginController.js index af71f09891..a075e00f36 100644 --- a/src/app/vault/vaultAddLoginController.js +++ b/src/app/vault/vaultAddLoginController.js @@ -17,7 +17,7 @@ $scope.savePromise = null; $scope.save = function (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'); var decLogin = cipherService.decryptLogin(loginResponse); $uibModalInstance.close(decLogin); diff --git a/src/app/vault/vaultAttachmentsController.js b/src/app/vault/vaultAttachmentsController.js index 20dc00e4d3..910ccf1986 100644 --- a/src/app/vault/vaultAttachmentsController.js +++ b/src/app/vault/vaultAttachmentsController.js @@ -13,10 +13,10 @@ authService.getUserProfile().then(function (profile) { $scope.isPremium = profile.premium; - return apiService.logins.get({ id: loginId }).$promise; - }).then(function (login) { - $scope.login = cipherService.decryptLogin(login); - $scope.readOnly = !login.Edit; + return apiService.ciphers.get({ id: loginId }).$promise; + }).then(function (cipher) { + $scope.login = cipherService.decryptLogin(cipher); + $scope.readOnly = !$scope.login.edit; $scope.canUseAttachments = $scope.isPremium || $scope.login.organizationId; $scope.loading = false; }, function () { diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js index e3a2e16bbc..2505c6452d 100644 --- a/src/app/vault/vaultController.js +++ b/src/app/vault/vaultController.js @@ -193,7 +193,7 @@ return; } - apiService.logins.del({ id: login.id }, function () { + apiService.ciphers.del({ id: login.id }, function () { $analytics.eventTrack('Deleted Login'); removeLoginFromScopes(login); }); diff --git a/src/app/vault/vaultEditLoginController.js b/src/app/vault/vaultEditLoginController.js index 19b1d171c9..38f699c944 100644 --- a/src/app/vault/vaultEditLoginController.js +++ b/src/app/vault/vaultEditLoginController.js @@ -10,10 +10,10 @@ authService.getUserProfile().then(function (profile) { $scope.useTotp = profile.premium; - return apiService.logins.get({ id: loginId }).$promise; + return apiService.ciphers.get({ id: loginId }).$promise; }).then(function (login) { $scope.login = cipherService.decryptLogin(login); - $scope.readOnly = !login.Edit; + $scope.readOnly = !$scope.login.edit; $scope.useTotp = $scope.useTotp || $scope.login.organizationUseTotp; }); @@ -36,7 +36,7 @@ } else { 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'); var decLogin = cipherService.decryptLogin(loginResponse); $uibModalInstance.close({ @@ -86,7 +86,7 @@ return; } - apiService.logins.del({ id: $scope.login.id }, function () { + apiService.ciphers.del({ id: $scope.login.id }, function () { $analytics.eventTrack('Deleted Login From Edit'); $uibModalInstance.close({ action: 'delete', diff --git a/src/app/vault/vaultShareLoginController.js b/src/app/vault/vaultShareLoginController.js index e72734b3a5..8ef882abf3 100644 --- a/src/app/vault/vaultShareLoginController.js +++ b/src/app/vault/vaultShareLoginController.js @@ -14,7 +14,7 @@ $scope.loading = true; $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; if (login.Edit) { $scope.login = cipherService.decryptLogin(login);