add .prettierrc, and make prettier

This commit is contained in:
AJ ONeal 2019-06-13 03:53:54 -06:00
parent 3cd68f93e8
commit 1afddd9aae
4 changed files with 80 additions and 65 deletions

8
.prettierrc Normal file
View File

@ -0,0 +1,8 @@
{
"bracketSpacing": true,
"printWidth": 80,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "none",
"useTabs": true
}

View File

@ -30,14 +30,14 @@ module.exports.create = function(config) {
form: { form: {
type: 'TXT', type: 'TXT',
name: dnsPrefix, name: dnsPrefix,
data: '"'+txt+'"', // vultr requires the TXT record wraped in quotes data: '"' + txt + '"', // vultr requires the TXT record wraped in quotes
domain: config.domain, domain: config.domain,
ttl: 300 ttl: 300
} }
}).then(function(resp) { }).then(function(resp) {
if(resp.statusCode==200){ if (resp.statusCode == 200) {
return true; return true;
}else{ } else {
console.log(resp.statusCode); console.log(resp.statusCode);
console.log(resp.body); console.log(resp.body);
throw new Error('record did not set. check subdomain, api key, etc'); throw new Error('record did not set. check subdomain, api key, etc');
@ -53,24 +53,26 @@ module.exports.create = function(config) {
return request({ return request({
method: 'GET', method: 'GET',
url: url+'?domain='+config.domain, url: url + '?domain=' + config.domain,
// PROBLEM (fixed): Remember to set json: true (not need to JSON.parse) // PROBLEM (fixed): Remember to set json: true (not need to JSON.parse)
json: true, json: true,
headers: { headers: {
'API-Key': apiKey 'API-Key': apiKey
} }
}).then(function(resp) { })
if(resp.statusCode==200){ .then(function(resp) {
if (resp.statusCode == 200) {
resp = resp.body; resp = resp.body;
console.log(resp); console.log(resp);
var entries = var entries = resp.filter(function(x) {
resp.filter(function(x) {
return x.type === 'TXT'; return x.type === 'TXT';
}); });
var entry = entries.filter(function(x) { var entry = entries.filter(function(x) {
// vultr wraps the TXT record in double quotes // vultr wraps the TXT record in double quotes
return x.data.substring(1, x.data.length - 1) === ch.dnsAuthorization; return (
x.data.substring(1, x.data.length - 1) === ch.dnsAuthorization
);
})[0]; })[0];
if (entry) { if (entry) {
@ -80,10 +82,11 @@ module.exports.create = function(config) {
"Couldn't remove record. check subdomain, api key, etc" "Couldn't remove record. check subdomain, api key, etc"
); );
} }
}else{ } else {
throw new Error("record did not set. check subdomain, api key, etc"); throw new Error(
'record did not set. check subdomain, api key, etc'
);
} }
}) })
.then(function(recordId) { .then(function(recordId) {
var domainname = data.challenge.altname; var domainname = data.challenge.altname;
@ -98,15 +101,17 @@ module.exports.create = function(config) {
}, },
form: { form: {
domain: config.domain, domain: config.domain,
'RECORDID': recordId RECORDID: recordId
} }
}).then(function(resp) { }).then(function(resp) {
if(resp.statusCode==200){ if (resp.statusCode == 200) {
return true; return true;
}else{ } else {
console.log(resp.statusCode); console.log(resp.statusCode);
console.log(resp.body); console.log(resp.body);
throw new Error("record did not remove. check subdomain, api key, etc"); throw new Error(
'record did not remove. check subdomain, api key, etc'
);
} }
}); });
}); });
@ -122,7 +127,7 @@ module.exports.create = function(config) {
return request({ return request({
method: 'GET', method: 'GET',
url: url+'?domain='+config.domain, url: url + '?domain=' + config.domain,
json: true, json: true,
headers: { headers: {
'API-Key': apiKey 'API-Key': apiKey
@ -140,7 +145,9 @@ module.exports.create = function(config) {
})[0]; })[0];
if (entry) { if (entry) {
return { dnsAuthorization: entry.data.substring(1, entry.data.length - 1)}; return {
dnsAuthorization: entry.data.substring(1, entry.data.length - 1)
};
} else { } else {
return null; return null;
} }

View File

@ -8,7 +8,7 @@ var tester = require('acme-challenge-test');
var zone = process.argv[2]; var zone = process.argv[2];
var challenger = require('./index.js').create({ var challenger = require('./index.js').create({
apiKey: process.argv[3], apiKey: process.argv[3],
domain:zone domain: zone
}); });
// The dry-run tests can pass on, literally, 'example.com' // The dry-run tests can pass on, literally, 'example.com'