Merge branch 'master' into release/2.0.6

bluehalo · Dec 5, 2019 · 97b14e5 · 97b14e5
2 parents de41269 + 52e891a
commit 97b14e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "helmet": "^3.9.0",
     "jsonschema": "^1.2.2",
     "jsonwebtoken": "^8.1.0",
-    "jwk-to-pem": "^1.2.6",
+    "jwk-to-pem": "^2.0.2",
     "method-override": "^2.3.10",
     "moment": "^2.19.4",
     "moment-timezone": "^0.5.14",

diff --git a/src/server/server.js b/src/server/server.js
@@ -126,7 +126,7 @@ class Server {
 
 		this.env = {
 			IS_PRODUCTION: !process.env.NODE_ENV || process.env.NODE_ENV === 'production',
-			USE_HTTPS: server.ssl && server.ssl.key && server.ssl.cert,
+			USE_HTTPS: (server.ssl && server.ssl.key && server.ssl.cert) ? server.ssl : undefined,
 		};
 		// return self for chaining
 		return this;