diff --git a/src/Vault/wwwroot/app/services/apiService.js b/src/Vault/wwwroot/app/services/apiService.js index b01a06e5e4..6f4b0e0e96 100644 --- a/src/Vault/wwwroot/app/services/apiService.js +++ b/src/Vault/wwwroot/app/services/apiService.js @@ -21,6 +21,13 @@ del: { method: 'DELETE', params: { id: '@id' } } }); + _service.ciphers = $resource(_apiUri + '/ciphers/:id', {}, { + get: { method: 'GET', params: { id: '@id' } }, + list: { method: 'GET', params: {} }, + 'import': { url: _apiUri + '/ciphers/import', method: 'POST', params: {} }, + del: { method: 'DELETE', params: { id: '@id' } } + }); + _service.accounts = $resource(_apiUri + '/accounts', {}, { register: { url: _apiUri + '/accounts/register', method: 'POST', params: {} }, emailToken: { url: _apiUri + '/accounts/email-token', method: 'POST', params: {} }, diff --git a/src/Vault/wwwroot/app/services/importService.js b/src/Vault/wwwroot/app/services/importService.js index 22bedbce76..4c97b0696a 100644 --- a/src/Vault/wwwroot/app/services/importService.js +++ b/src/Vault/wwwroot/app/services/importService.js @@ -24,7 +24,7 @@ complete: function (results) { var folders = [], sites = [], - siteRelationships = []; + folderRelationships = []; angular.forEach(results.data, function (value, key) { if (!value.uri || value.uri === '') { @@ -65,11 +65,11 @@ key: siteIndex, value: folderIndex }; - siteRelationships.push(relationship); + folderRelationships.push(relationship); } }); - success(folders, sites, siteRelationships); + success(folders, sites, folderRelationships); } }); } diff --git a/src/Vault/wwwroot/app/tools/toolsImportController.js b/src/Vault/wwwroot/app/tools/toolsImportController.js index 5dfe34d7f3..8adcfd57a6 100644 --- a/src/Vault/wwwroot/app/tools/toolsImportController.js +++ b/src/Vault/wwwroot/app/tools/toolsImportController.js @@ -10,11 +10,11 @@ importService.import(model.source, file, importSuccess, importError); }; - function importSuccess(folders, sites, siteRelationships) { - apiService.accounts.import({ + function importSuccess(folders, sites, folderRelationships) { + apiService.ciphers.import({ folders: cipherService.encryptFolders(folders, cryptoService.getKey()), sites: cipherService.encryptSites(sites, cryptoService.getKey()), - siteRelationships: siteRelationships + folderRelationships: folderRelationships }, function () { $uibModalInstance.dismiss('cancel'); $state.go('backend.vault').then(function () {