1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00

lint fixes

This commit is contained in:
Kyle Spearrin
2017-11-04 21:37:35 -04:00
parent 11edb0261b
commit 8e998ff179
5 changed files with 81 additions and 77 deletions

View File

@@ -2,41 +2,44 @@ import { CipherString } from '../domain/cipherString';
export default abstract class Domain {
protected buildDomainModel(model: any, obj: any, map: any, alreadyEncrypted: boolean, notEncList: any = []) {
for (var prop in map) {
if (map.hasOwnProperty(prop)) {
var objProp = obj[(map[prop] || prop)];
if (alreadyEncrypted === true || notEncList.indexOf(prop) > -1) {
model[prop] = objProp ? objProp : null;
} else {
model[prop] = objProp ? new CipherString(objProp) : null;
}
for (const prop in map) {
if (!map.hasOwnProperty(prop)) {
continue;
}
const objProp = obj[(map[prop] || prop)];
if (alreadyEncrypted === true || notEncList.indexOf(prop) > -1) {
model[prop] = objProp ? objProp : null;
} else {
model[prop] = objProp ? new CipherString(objProp) : null;
}
}
}
protected async decryptObj(model: any, self: any, map: any, orgId: string) {
var promises = [];
for (let prop in map) {
const promises = [];
for (const prop in map) {
if (!map.hasOwnProperty(prop)) {
continue;
}
// tslint:disable-next-line
(function (theProp) {
let promise = Promise.resolve().then(function () {
var mapProp = map[theProp] || theProp;
const p = Promise.resolve().then(() => {
const mapProp = map[theProp] || theProp;
if (self[mapProp]) {
return self[mapProp].decrypt(orgId);
}
return null;
}).then(function (val) {
}).then((val: any) => {
model[theProp] = val;
return;
});
promises.push(promise);
promises.push(p);
})(prop);
}
await Promise.all(promises);
return model;
}
}
}

View File

@@ -1,7 +1,7 @@
import { CipherString } from './cipherString';
import { FolderData } from '../data/folderData'
import { FolderData } from '../data/folderData';
import Domain from './domain'
import { CipherString } from './cipherString';
import Domain from './domain';
class Folder extends Domain {
id: string;
@@ -9,24 +9,23 @@ class Folder extends Domain {
constructor(obj?: FolderData, alreadyEncrypted: boolean = false) {
super();
if(obj == null) {
if (obj == null) {
return;
}
this.buildDomainModel(this, obj, {
id: null,
name: null
name: null,
}, alreadyEncrypted, ['id']);
}
async decrypt(): Promise<any> {
var self = this;
var model = {
id: self.id
const model = {
id: this.id,
};
return await this.decryptObj(model, this, {
name: null
name: null,
}, null);
}
}