Fix for uploading files to a shared credential

This commit is contained in:
brantje 2016-10-06 19:30:01 +02:00
parent 342385232c
commit a413d48e5f
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F

View file

@ -155,15 +155,29 @@ angular.module('passmanApp')
};
$scope.fileLoaded = function (file) {
var key;
var _file = {
filename: file.name,
size: file.size,
mimetype: file.type,
data: file.data
};
FileService.uploadFile(_file).then(function (result) {
if (!$scope.storedCredential.hasOwnProperty('acl') && $scope.storedCredential.hasOwnProperty('shared_key')) {
if ($scope.storedCredential.shared_key) {
key = EncryptService.decryptString(angular.copy($scope.storedCredential.shared_key));
}
}
if ($scope.storedCredential.hasOwnProperty('acl')) {
key = EncryptService.decryptString(angular.copy($scope.storedCredential.acl.shared_key));
}
FileService.uploadFile(_file, key).then(function (result) {
delete result.file_data;
result.filename = EncryptService.decryptString(result.filename);
result.filename = EncryptService.decryptString(result.filename, key);
$scope.storedCredential.files.push(result);
});