Merge pull request #1 from preprio/compatibility-fix

Fix: syntax compatibility on 23, Feb 2021

Author: tim-hanssen

.prettierrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  arrowParens: 'avoid',
+  tabWidth: 2,
+  printWidth: 80,
+  vueIndentScriptAndStyle: false,
+  quoteProps: 'consistent',
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'all',
+}

lib/index.js

@@ -14,13 +14,12 @@ class PreprClient {
     this._token = token
     this._baseUrl = baseUrl
     this._timeout = timeout
+    this._abTestingValue = null
+    this._hasAbTesting = false
 
     userId && this._hashUserId(userId)
   }
 
-  _abTestingValue = null
-  _hasAbTesting = false
-
   _hashUserId(userId) {
     const hashValue = murmurhash.v3(userId, 1)
     const ratio = hashValue / Math.pow(2, 32)
@@ -96,20 +95,25 @@ class PreprClient {
 
     const requestString = `${this._baseUrl}${this._path}?${hasQueryString}`
 
-    const abTestingHeaders = this._hasAbTesting && {
-      'Prepr-ABTesting': this._userId,
+    const headers = {
+      Authorization: `Bearer ${this._token}`,
+    }
+
+    Object.assign(headers, options.headers)
+
+    if (this._hasAbTesting) {
+      Object.assign(headers, {
+        'Prepr-ABTesting': this._userId,
+      })
     }
 
     const requestOptions = {
-      ...options,
       signal: controller.signal,
-      headers: {
-        ...options.headers,
-        ...abTestingHeaders,
-        Authorization: `Bearer ${this._token}`,
-      },
+      headers,
     }
 
+    Object.assign(requestOptions, options)
+
     try {
       const response = await fetch(requestString, requestOptions)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@preprio/nodejs-sdk",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Prepr Node.js SDK",
   "main": "lib/index.js",
   "directories": {