bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 07:13:32 +00:00
Code Issues Releases Wiki Activity

attachment display and download. refactor to WC

Browse Source
This commit is contained in:
Kyle Spearrin
2017-07-11 23:04:53 -04:00
parent 1cacc9e729
commit 63be97d1b9
7 changed files with 348 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/models/domainModels.js
View File

@@ -113,10 +113,10 @@ var Login = function (obj, alreadyEncrypted) {
this.totp = obj.totp ? new CipherString(obj.totp) : null;
}
if (response.attachments) {
if (obj.attachments) {
this.attachments = [];
for (var i = 0; i < response.attachments.length; i++) {
this.attachments.push(new Attachment(response.attachments[i], alreadyEncrypted));
for (var i = 0; i < obj.attachments.length; i++) {
this.attachments.push(new Attachment(obj.attachments[i], alreadyEncrypted));
}
}
else {
@@ -179,6 +179,7 @@ var Folder = function (obj, alreadyEncrypted) {
favorite: self.favorite
};
var attachments = [];
var deferred = Q.defer();
self.name.decrypt(self.organizationId).then(function (val) {
@@ -217,6 +218,41 @@ var Folder = function (obj, alreadyEncrypted) {
return null;
}).then(function (val) {
model.totp = val;
if (self.attachments) {
var attachmentPromises = [];
for (var i = 0; i < self.attachments.length; i++) {
(function (attachment) {
var promise = attachment.decrypt(self.organizationId).then(function (decAttachment) {
attachments.push(decAttachment);
});
attachmentPromises.push(promise);
})(self.attachments[i]);
}
return Q.all(attachmentPromises);
}
return;
}).then(function () {
model.attachments = attachments.length ? attachments : null;
deferred.resolve(model);
});
return deferred.promise;
};
Attachment.prototype.decrypt = function (orgId) {
var self = this;
var model = {
id: self.id,
size: self.size,
sizeName: self.sizeName,
url: self.url
};
var deferred = Q.defer();
self.fileName.decrypt(orgId).then(function (val) {
model.fileName = val;
deferred.resolve(model);
});