From 0cbdf53322dde2c5ae881b83758ecbd5a691f156 Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Sat, 6 Apr 2019 12:34:34 -0600
Subject: [PATCH] v2.7.10: allow simpler return from approveDomains

---
 index.js          | 8 ++++++++
 package-lock.json | 8 ++++----
 package.json      | 6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/index.js b/index.js
index 7f9eef8..108a161 100644
--- a/index.js
+++ b/index.js
@@ -458,6 +458,14 @@ Greenlock.create = function (gl) {
           log(gl.debug, results.options);
 
           var options = results.options || results;
+          if (opts !== options) {
+            Object.keys(options).forEach(function (key) {
+              if ('undefined' !== typeof options[key]) {
+                opts[key] = options[key];
+              }
+            });
+            options = opts;
+          }
           // just in case we get a completely different object from the one we originally created
           if (!options.account) { options.account = {}; }
           if (!options.certificate) { options.certificate = {}; }
diff --git a/package-lock.json b/package-lock.json
index bbecff5..5f4964a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "greenlock",
-  "version": "2.7.9",
+  "version": "2.7.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -46,9 +46,9 @@
       }
     },
     "le-challenge-dns": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/le-challenge-dns/-/le-challenge-dns-3.0.2.tgz",
-      "integrity": "sha512-cmg26G2VdcRL9Ja8JegsES3B2jBTZ/LkkaqzrUAMRl2UQQiS/+kursn3J761ht58/sXOpYVp5V6rQwIXSknDbg=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/le-challenge-dns/-/le-challenge-dns-3.0.3.tgz",
+      "integrity": "sha512-6jz9YMpWhTXJKK+Id/S0j8R3oEiH6ya5WBTPzc7GsNR21voesejP7UJaDcdH9GQrjf7gBX3xyr4BlL/GplNBOw=="
     },
     "le-challenge-fs": {
       "version": "2.0.8",
diff --git a/package.json b/package.json
index e67afcd..3afb821 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "greenlock",
-  "version": "2.7.9",
+  "version": "2.7.10",
   "description": "Let's Encrypt for node.js on npm",
   "main": "index.js",
   "files": [
@@ -42,10 +42,10 @@
     "acme-v2": "^1.7.5",
     "cert-info": "^1.5.1",
     "keypairs": "^1.2.14",
-    "le-challenge-dns": "^3.0.2",
+    "le-challenge-dns": "^3.0.3",
     "le-challenge-fs": "^2.0.2",
     "le-sni-auto": "^2.1.8",
-    "le-store-certbot": "^2.2.1",
+    "le-store-certbot": "^2.2.2",
     "le-store-fs": "^1.0.2",
     "rsa-compat": "^2.0.6"
   },