Run prettier

This commit is contained in:
Yarmo Mackenbach 2021-03-01 18:27:29 +01:00
parent 0bb3a59964
commit 95ac04b838
No known key found for this signature in database
GPG key ID: 37367F4AF4087AD1
4 changed files with 47 additions and 39 deletions

View file

@ -22,16 +22,22 @@ const keys = require('./keys')
const utils = require('./utils')
// Promise.allSettled polyfill
Promise.allSettled = Promise.allSettled || ((promises) => Promise.all(promises.map(p => p
.then(v => ({
Promise.allSettled =
Promise.allSettled ||
((promises) =>
Promise.all(
promises.map((p) =>
p
.then((v) => ({
status: 'fulfilled',
value: v,
}))
.catch(e => ({
.catch((e) => ({
status: 'rejected',
reason: e,
}))
)));
)
))
const runVerificationJson = (
res,

View file

@ -31,12 +31,12 @@ const fetchHKP = (identifier, keyserverBaseUrl) => {
query: identifier,
}
let publicKey = await hkp.lookup(lookupOpts)
.catch((error) => {
let publicKey = await hkp.lookup(lookupOpts).catch((error) => {
reject('Key does not exist or could not be fetched')
})
publicKey = await openpgp.key.readArmored(publicKey)
publicKey = await openpgp.key
.readArmored(publicKey)
.then((result) => {
return result.keys[0]
})
@ -59,7 +59,8 @@ const fetchWKD = (identifier) => {
email: identifier,
}
const publicKey = await wkd.lookup(lookupOpts)
const publicKey = await wkd
.lookup(lookupOpts)
.then((result) => {
return result.keys[0]
})
@ -90,7 +91,8 @@ const fetchKeybase = (username, fingerprint) => {
reject(`Error fetching Keybase key: ${e.message}`)
}
const publicKey = await openpgp.key.readArmored(rawKeyContent)
const publicKey = await openpgp.key
.readArmored(rawKeyContent)
.then((result) => {
return result.keys[0]
})

View file

@ -23,7 +23,7 @@ const customRequestHandler = async (spData, opts) => {
const client = new Twitter({
bearer_token: opts.twitterBearerToken,
})
const res = await client.get('statuses/show', {id: match[2]})
const res = await client.get('statuses/show', { id: match[2] })
return res.text
} else if ('nitterInstance' in opts && opts.nitterInstance) {
spData.proof.fetch = `https://${opts.nitterInstance}/${match[1]}/status/${match[2]}`

View file

@ -66,14 +66,14 @@ const verify = (signature, opts) => {
try {
keyUri = sigKeys[0]
keyData = await keys.fetch.uri(keyUri)
} catch(e) {}
} catch (e) {}
}
// Try WKD
if (!keyData && signersUserId) {
try {
keyUri = `wkd:${signersUserId}`
keyData = await keys.fetch.uri(keyUri)
} catch(e) {}
} catch (e) {}
}
// Try HKP
if (!keyData) {
@ -81,7 +81,7 @@ const verify = (signature, opts) => {
const match = preferredKeyServer.match(/^(.*\:\/\/)?([^/]*)(?:\/)?$/i)
keyUri = `hkp:${match[2]}:${issuerKeyId ? issuerKeyId : signersUserId}`
keyData = await keys.fetch.uri(keyUri)
} catch(e) {
} catch (e) {
errors.push('key_not_found')
reject({ errors: errors })
return