Merge pull request #74 from kaleido-io/defaultOptionsFix

use correct options object for baseURLs

Author: nguyer

lib/http.ts

@@ -57,11 +57,11 @@ export default class HttpBase {
     this.options = this.setDefaults(options);
     this.rootHttp = axios.create({
       ...options.requestConfig,
-      baseURL: options.baseURL,
+      baseURL: this.options.baseURL,
     });
     this.http = axios.create({
       ...options.requestConfig,
-      baseURL: options.namespaceBaseURL,
+      baseURL: this.options.namespaceBaseURL,
     });
   }
 
@@ -70,7 +70,9 @@ export default class HttpBase {
     if (!baseURLSet && (options.host ?? '') === '') {
       throw new Error('Invalid options. Option host, or baseURL and namespaceBaseURL must be set.');
     }
-
+    if ((options.host ?? '') === '' && (options.websocket?.host ?? '') === '') {
+      throw new Error('Invalid options. Option host, or websocket.host must be set.');
+    }
     return {
       ...options,
       baseURL: baseURLSet ? options.baseURL : `${options.host}/api/v1`,

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger/firefly-sdk",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "Client SDK for Hyperledger FireFly",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",