From 1afddd9aae635412840b25a08821dcd22694a8b6 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Thu, 13 Jun 2019 03:53:54 -0600 Subject: [PATCH] add .prettierrc, and make prettier --- .prettierrc | 8 ++++++ lib/index.js | 77 ++++++++++++++++++++++++++++------------------------ package.json | 54 ++++++++++++++++++------------------ test.js | 6 ++-- 4 files changed, 80 insertions(+), 65 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..420e082 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,8 @@ +{ + "bracketSpacing": true, + "printWidth": 80, + "singleQuote": true, + "tabWidth": 2, + "trailingComma": "none", + "useTabs": true +} diff --git a/lib/index.js b/lib/index.js index 2b6de4f..99f92fa 100644 --- a/lib/index.js +++ b/lib/index.js @@ -30,14 +30,14 @@ module.exports.create = function(config) { form: { type: 'TXT', 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, ttl: 300 } }).then(function(resp) { - if(resp.statusCode==200){ + if (resp.statusCode == 200) { return true; - }else{ + } else { console.log(resp.statusCode); console.log(resp.body); throw new Error('record did not set. check subdomain, api key, etc'); @@ -53,37 +53,40 @@ module.exports.create = function(config) { return request({ method: 'GET', - url: url+'?domain='+config.domain, + url: url + '?domain=' + config.domain, // PROBLEM (fixed): Remember to set json: true (not need to JSON.parse) json: true, headers: { - 'API-Key': apiKey + 'API-Key': apiKey } - }).then(function(resp) { - if(resp.statusCode==200){ - resp = resp.body; - console.log(resp); - var entries = - resp.filter(function(x) { + }) + .then(function(resp) { + if (resp.statusCode == 200) { + resp = resp.body; + console.log(resp); + var entries = resp.filter(function(x) { return x.type === 'TXT'; }); - var entry = entries.filter(function(x) { - // vultr wraps the TXT record in double quotes - return x.data.substring(1, x.data.length - 1) === ch.dnsAuthorization; - })[0]; + var entry = entries.filter(function(x) { + // vultr wraps the TXT record in double quotes + return ( + x.data.substring(1, x.data.length - 1) === ch.dnsAuthorization + ); + })[0]; - if (entry) { - return entry['RECORDID']; + if (entry) { + return entry['RECORDID']; + } else { + throw new Error( + "Couldn't remove record. check subdomain, api key, etc" + ); + } } else { throw new Error( - "Couldn't remove record. check subdomain, api key, etc" + 'record did not set. check subdomain, api key, etc' ); } - }else{ - throw new Error("record did not set. check subdomain, api key, etc"); - } - }) .then(function(recordId) { var domainname = data.challenge.altname; @@ -94,19 +97,21 @@ module.exports.create = function(config) { method: 'POST', url: url, headers: { - 'API-Key': apiKey + 'API-Key': apiKey }, - form: { - domain: config.domain, - 'RECORDID': recordId - } + form: { + domain: config.domain, + RECORDID: recordId + } }).then(function(resp) { - if(resp.statusCode==200){ + if (resp.statusCode == 200) { return true; - }else{ + } else { console.log(resp.statusCode); 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,16 +127,16 @@ module.exports.create = function(config) { return request({ method: 'GET', - url: url+'?domain='+config.domain, + url: url + '?domain=' + config.domain, json: true, headers: { - 'API-Key': apiKey + 'API-Key': apiKey } }).then(function(resp) { resp = resp.body; var entries = resp.filter(function(x) { - return x.type === 'TXT'; + return x.type === 'TXT'; }); var entry = entries.filter(function(x) { @@ -140,9 +145,11 @@ module.exports.create = function(config) { })[0]; if (entry) { - return { dnsAuthorization: entry.data.substring(1, entry.data.length - 1)}; + return { + dnsAuthorization: entry.data.substring(1, entry.data.length - 1) + }; } else { - return null; + return null; } }); } diff --git a/package.json b/package.json index f9dfb32..f2cdb01 100644 --- a/package.json +++ b/package.json @@ -1,29 +1,29 @@ { - "name": "acme-dns-01-vultr", - "version": "3.0.0", - "description": "Vultr DNS for Let's Encrypt / ACME dns-01 challenges with ACME.js and Greenlock.js", - "main": "index.js", - "scripts": { - "test": "node ./test.js" - }, - "repository": { - "type": "git", - "url": "https://git.rootprojects.org/root/acme-dns-01-vultr.git" - }, - "keywords": [ - "vultr", - "dns", - "dns-01", - "letsencrypt", - "acme", - "greenlock" - ], - "author": "AJ ONeal (https://coolaj86.com/)", - "license": "MPL-2.0", - "dependencies": { - "@root/request": "^1.3.11" - }, - "devDependencies": { - "acme-challenge-test": "^3.1.2" - } + "name": "acme-dns-01-vultr", + "version": "3.0.0", + "description": "Vultr DNS for Let's Encrypt / ACME dns-01 challenges with ACME.js and Greenlock.js", + "main": "index.js", + "scripts": { + "test": "node ./test.js" + }, + "repository": { + "type": "git", + "url": "https://git.rootprojects.org/root/acme-dns-01-vultr.git" + }, + "keywords": [ + "vultr", + "dns", + "dns-01", + "letsencrypt", + "acme", + "greenlock" + ], + "author": "AJ ONeal (https://coolaj86.com/)", + "license": "MPL-2.0", + "dependencies": { + "@root/request": "^1.3.11" + }, + "devDependencies": { + "acme-challenge-test": "^3.1.2" + } } diff --git a/test.js b/test.js index fe9b55d..8d5fb25 100644 --- a/test.js +++ b/test.js @@ -8,7 +8,7 @@ var tester = require('acme-challenge-test'); var zone = process.argv[2]; var challenger = require('./index.js').create({ apiKey: process.argv[3], - domain:zone + domain: zone }); // The dry-run tests can pass on, literally, 'example.com' @@ -19,7 +19,7 @@ tester .test('dns-01', domain, challenger) .then(function() { console.info('PASS', domain); - ///* + ///* domain = 'foo.' + zone; return tester @@ -34,7 +34,7 @@ tester console.info('PASS', domain); }); }); - //*/ + //*/ }) .catch(function(e) { console.error(e.message);