v1.2.1

iobroker-community-adapters · Feb 3, 2020 · 208a1d9 · 208a1d9
1 parent 19419c7
commit 208a1d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -34,6 +34,9 @@ Connect your Philips Hue Lights with ioBroker.
 
 Please also see [release page](https://github.com/Zefau/ioBroker.hue-extended/releases) for changelog and detailed information.
 
+### 1.2.1 (2019-02-03)
+- (Zefau) fixed failing secure connection when selecting default certificates
+
 ### 1.2.0 (2019-11-23)
 - (Zefau) added option to change `transitiontime` on scenes (see [#24](https://github.com/Zefau/ioBroker.hue-extended/issues/24))
 

diff --git a/hue-extended.js b/hue-extended.js
@@ -77,14 +77,14 @@ function startAdapter(options)
 			{
 				REQUEST_OPTIONS = {
 					...REQUEST_OPTIONS,
-					'cert': _fs.readFileSync(adapter.config.certPublicPath),
-					'key': _fs.readFileSync(adapter.config.certPrivatePath),
+					'cert': adapter.config.certPublicPath.indexOf('.') === -1 ? adapter.config.certPublicPath : _fs.readFileSync(adapter.config.certPublicPath),
+					'key': adapter.config.certPrivatePath.indexOf('.') === -1 ? adapter.config.certPrivatePath : _fs.readFileSync(adapter.config.certPrivatePath),
 					'rejectUnauthorized': false,
 					'secureConnection': true
 				};
 
 				if (adapter.config.certChainedPath)
-					REQUEST_OPTIONS.ca = _fs.readFileSync(adapter.config.certChainedPath);
+					REQUEST_OPTIONS.ca = adapter.config.certChainedPath.indexOf('.') === -1 ? adapter.config.certChainedPath : _fs.readFileSync(adapter.config.certChainedPath);
 
 				if (REQUEST_OPTIONS.key.indexOf('ENCRYPTED') > -1)
 					REQUEST_OPTIONS.passphrase = adapter.config.passphrase;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,19 +38,19 @@
     }
   ],
   "dependencies": {
-    "@iobroker/adapter-core": "^2.1.0",
+    "@iobroker/adapter-core": "^2.2.1",
     "color-convert": "^2.0.1",
     "request": "^2.88.0",
     "request-promise": "^4.2.5"
   },
   "deprecated": false,
   "description": "Integration of your Philips Hue Lights with your ioBroker",
   "devDependencies": {
-    "@iobroker/testing": "^2.0.0",
-    "axios": "^0.19.1",
+    "@iobroker/testing": "^2.0.2",
+    "axios": "^0.19.2",
     "chai": "^4.2.0",
     "gulp": "^4.0.2",
-    "mocha": "^7.0.0"
+    "mocha": "^7.0.1"
   },
   "directories": {
     "lib": "lib",