From 80721b237e5dbad2d1077e3a2eda96754683c76e Mon Sep 17 00:00:00 2001 From: Simon Vareille Date: Sat, 13 Jun 2020 11:11:25 +0200 Subject: [PATCH] Fix merge bug --- src/service/pgp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/service/pgp.js b/src/service/pgp.js index 0ebbf3b..0cd7648 100644 --- a/src/service/pgp.js +++ b/src/service/pgp.js @@ -68,7 +68,7 @@ class PGP { } // check for at least one valid user id - const userIds = await this.parseUserIds(key.users, primaryKey, verifyDate); + const {userIds, status} = await this.parseUserIds(key.users, primaryKey, verifyDate); if (!userIds.length) { if (status == 1) { util.throw(400, 'Invalid PGP key: no user ID comes from a valid organisation'); @@ -122,7 +122,7 @@ class PGP { /** * Parse an array of user ids and verify signatures - * @param {Array} users A list of openpgp.js user objects + * @param {Array} users A list of openpgp.js user objects * @param {Object} primaryKey The primary key packet of the key * @param {Date} verifyDate Verify user IDs at this point in time * @return {Array, integer} An array of user id objects and a satus indicator