Skip to content

Commit 97b14e5

Browse files
authored
Merge branch 'master' into release/2.0.6
2 parents de41269 + 52e891a commit 97b14e5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"helmet": "^3.9.0",
6060
"jsonschema": "^1.2.2",
6161
"jsonwebtoken": "^8.1.0",
62-
"jwk-to-pem": "^1.2.6",
62+
"jwk-to-pem": "^2.0.2",
6363
"method-override": "^2.3.10",
6464
"moment": "^2.19.4",
6565
"moment-timezone": "^0.5.14",

src/server/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class Server {
126126

127127
this.env = {
128128
IS_PRODUCTION: !process.env.NODE_ENV || process.env.NODE_ENV === 'production',
129-
USE_HTTPS: server.ssl && server.ssl.key && server.ssl.cert,
129+
USE_HTTPS: (server.ssl && server.ssl.key && server.ssl.cert) ? server.ssl : undefined,
130130
};
131131
// return self for chaining
132132
return this;

0 commit comments

Comments
 (0)