suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary calls to convertStreams()

Browse Source
This commit is contained in:
Daniel Huigens 2020-02-18 17:44:00 +01:00
parent ef7c38860b
commit 35c13212dd
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/openpgp.js
View File

@ -146,14 +146,14 @@ export function generateKey({ userIds = [], passphrase = "", numBits = 2048, rsa
const revocationCertificate = await key.getRevocationCertificate(date); const revocationCertificate = await key.getRevocationCertificate(date);
key.revocationSignatures = []; key.revocationSignatures = [];
return convertStreams({ return {
key: key, key: key,
privateKeyArmored: key.armor(), privateKeyArmored: key.armor(),
publicKeyArmored: key.toPublic().armor(), publicKeyArmored: key.toPublic().armor(),
revocationCertificate: revocationCertificate revocationCertificate: revocationCertificate
}); };
}).catch(onError.bind(null, 'Error generating keypair')); }).catch(onError.bind(null, 'Error generating keypair'));
} }
@ -179,14 +179,14 @@ export function reformatKey({ privateKey, userIds = [], passphrase = "", keyExpi
const revocationCertificate = await key.getRevocationCertificate(date); const revocationCertificate = await key.getRevocationCertificate(date);
key.revocationSignatures = []; key.revocationSignatures = [];
return convertStreams({ return {
key: key, key: key,
privateKeyArmored: key.armor(), privateKeyArmored: key.armor(),
publicKeyArmored: key.toPublic().armor(), publicKeyArmored: key.toPublic().armor(),
revocationCertificate: revocationCertificate revocationCertificate: revocationCertificate
}); };
}).catch(onError.bind(null, 'Error reformatting keypair')); }).catch(onError.bind(null, 'Error reformatting keypair'));
} }
@ -221,7 +221,6 @@ export function revokeKey({
return key.revoke(reasonForRevocation); return key.revoke(reasonForRevocation);
} }
}).then(async key => { }).then(async key => {
await convertStreams(key);
if (key.isPrivate()) { if (key.isPrivate()) {
const publicKey = key.toPublic(); const publicKey = key.toPublic();
return { return {
@ -636,27 +635,6 @@ async function convertStream(data, streaming, encoding = 'utf8') {
return data; return data;
} }
/**
* Convert object properties from Stream
* @param {Object} obj the data to convert
* @param {'web'|'ponyfill'|'node'|false} streaming (optional) whether to return ReadableStreams, and of what type
* @param {'utf8'|'binary'} encoding (optional) how to return data in Node Readable streams
* @param {Array<String>} keys (optional) which keys to return as streams, if possible
* @returns {Object} the data in the respective format
*/
async function convertStreams(obj, streaming, encoding = 'utf8', keys = []) {
if (Object.prototype.isPrototypeOf(obj) && !Uint8Array.prototype.isPrototypeOf(obj)) {
await Promise.all(Object.entries(obj).map(async ([key, value]) => { // recursively search all children
if (util.isStream(value) || keys.includes(key)) {
obj[key] = await convertStream(value, streaming, encoding);
} else {
await convertStreams(obj[key], streaming, encoding);
}
}));
}
return obj;
}
/** /**
* Link result.data to the message stream for cancellation. * Link result.data to the message stream for cancellation.
* @param {Object} result the data to convert * @param {Object} result the data to convert