Fix duplicate proofs

This commit is contained in:
Yarmo Mackenbach 2020-08-15 08:41:04 +02:00
parent b5d00fed7d
commit c4e7ab7151

View file

@ -188,10 +188,15 @@ async function verifyProofs(opts) {
return; return;
} }
let notations = []; let notations = [], notationsRaw = [];
for (var i = 0; i < keyData.publicKey.users.length; i++) { for (var i = 0; i < keyData.publicKey.users.length; i++) {
notations = notations.concat(keyData.publicKey.users[i].selfCertifications[0].notations); notationsRaw = notationsRaw.concat(keyData.publicKey.users[i].selfCertifications[0].notations);
} }
notationsRaw.forEach((item, i) => {
if (item[0] == "proof@metacode.biz") {
notations.push(item[1]);
}
});
notations = Array.from(new Set(notations)); // Deduplicate (ES6) notations = Array.from(new Set(notations)); // Deduplicate (ES6)
// Display feedback // Display feedback
@ -200,8 +205,7 @@ async function verifyProofs(opts) {
let notation, isVerified, verifications = []; let notation, isVerified, verifications = [];
for (var i = 0; i < notations.length; i++) { for (var i = 0; i < notations.length; i++) {
notation = notations[i]; notation = notations[i];
if (notation[0] != "proof@metacode.biz") { continue; } verifications.push(await verifyProof(notation, keyData.fingerprint));
verifications.push(await verifyProof(notation[1], keyData.fingerprint));
} }
// One-line sorting function (order verifications by type) // One-line sorting function (order verifications by type)
@ -244,10 +248,15 @@ async function displayProfile(opts) {
let userName = userData.name ? userData.name : userData.email; let userName = userData.name ? userData.name : userData.email;
let userMail = userData.email ? userData.email : null; let userMail = userData.email ? userData.email : null;
let notations = []; let notations = [], notationsRaw = [];
for (var i = 0; i < keyData.publicKey.users.length; i++) { for (var i = 0; i < keyData.publicKey.users.length; i++) {
notations = notations.concat(keyData.publicKey.users[i].selfCertifications[0].notations); notationsRaw = notationsRaw.concat(keyData.publicKey.users[i].selfCertifications[0].notations);
} }
notationsRaw.forEach((item, i) => {
if (item[0] == "proof@metacode.biz") {
notations.push(item[1]);
}
});
notations = Array.from(new Set(notations)); // Deduplicate (ES6) notations = Array.from(new Set(notations)); // Deduplicate (ES6)
// Determine WKD or HKP link // Determine WKD or HKP link
@ -372,8 +381,7 @@ async function displayProfile(opts) {
let proofResult; let proofResult;
for (var i = 0; i < notations.length; i++) { for (var i = 0; i < notations.length; i++) {
notation = notations[i]; notation = notations[i];
if (notation[0] != "proof@metacode.biz") { continue; } proofResult = await verifyProof(notation, keyData.fingerprint);
proofResult = await verifyProof(notation[1], keyData.fingerprint);
if (!proofResult || !proofResult.display) { continue; } if (!proofResult || !proofResult.display) { continue; }
verifications.push(proofResult); verifications.push(proofResult);
} }