homey-api 1.6.0 → 1.6.1

package/lib/AthomCloudAPI.js

@@ -304,10 +304,11 @@ for(const device of Object.values(devices)) {
     body.append('grant_type', 'client_credentials');
 
     const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-      body,
+      body: body.toString(),
       method: 'post',
       headers: {
-        Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+        'Authorization': `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+        'Content-Type': 'application/x-www-form-urlencoded',
       },
     });
 
@@ -358,10 +359,11 @@ for(const device of Object.values(devices)) {
     body.append('code', code);
 
     const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-      body,
+      body: body.toString(),
       method: 'post',
       headers: {
-        Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+        'Authorization': `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+        'Content-Type': 'application/x-www-form-urlencoded',
       },
     });
 
@@ -418,10 +420,11 @@ for(const device of Object.values(devices)) {
     body.append('password', password);
 
     const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-      body,
+      body: body.toString(),
       method: 'post',
       headers: {
-        Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+        'Authorization': `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+        'Content-Type': 'application/x-www-form-urlencoded',
       },
     });
 
@@ -462,10 +465,11 @@ for(const device of Object.values(devices)) {
         body.append('refresh_token', this.__token.refresh_token);
 
         const response = await Util.fetch(`${this.baseUrl}/oauth2/token`, {
-          body,
+          body: body.toString(),
           method: 'post',
           headers: {
-            Authorization: `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+            'Authorization': `Basic ${Util.base64(`${this.__clientId}:${this.__clientSecret}`)}`,
+            'Content-Type': 'application/x-www-form-urlencoded',
           },
         });
 

package/lib/Util.js

@@ -22,7 +22,6 @@ class Util {
       return fetch(...args);
     }
 
-    // If in a browser
     if (this.isBrowser()) {
       return window.fetch(...args);
     }
@@ -138,19 +137,58 @@ class Util {
   }
 
   /**
+   * This method encodes a string into a base64 string.
+   * It's provided as Util because Node.js uses `Buffer`,
+   * browsers use `btoa` and React Native doesn't provide anything.
    * @param {string} input - Input
    * @returns {string} - Base64 encoded output
    */
-  static base64(str) {
-    if (typeof btoa === 'function') {
-      return btoa(str);
+  static base64(s) {
+    function btoaLookup(index) {
+      if (index >= 0 && index < 64) {
+        const keystr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+        return keystr[index];
+      }
+
+      // Throw INVALID_CHARACTER_ERR exception here -- won't be hit in the tests.
+      return undefined;
     }
 
-    if (typeof Buffer !== 'undefined') {
-      return Buffer.from(str).toString('base64');
+    if (typeof s !== 'string') {
+      throw new Error('Invalid Input');
     }
 
-    throw new Error('No Base64 Methods Available');
+    let i;
+
+    // "The btoa() method must throw an "InvalidCharacterError" DOMException if
+    // data contains any character whose code point is greater than U+00FF."
+    for (i = 0; i < s.length; i++) {
+      if (s.charCodeAt(i) > 255) {
+        return null;
+      }
+    }
+    let out = '';
+    for (i = 0; i < s.length; i += 3) {
+      const groupsOfSix = [undefined, undefined, undefined, undefined];
+      groupsOfSix[0] = s.charCodeAt(i) >> 2;
+      groupsOfSix[1] = (s.charCodeAt(i) & 0x03) << 4;
+      if (s.length > i + 1) {
+        groupsOfSix[1] |= s.charCodeAt(i + 1) >> 4;
+        groupsOfSix[2] = (s.charCodeAt(i + 1) & 0x0f) << 2;
+      }
+      if (s.length > i + 2) {
+        groupsOfSix[2] |= s.charCodeAt(i + 2) >> 6;
+        groupsOfSix[3] = s.charCodeAt(i + 2) & 0x3f;
+      }
+      for (let j = 0; j < groupsOfSix.length; j++) {
+        if (typeof groupsOfSix[j] === 'undefined') {
+          out += '=';
+        } else {
+          out += btoaLookup(groupsOfSix[j]);
+        }
+      }
+    }
+    return out;
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-api",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Homey API",
   "main": "index.js",
   "types": "assets/types/homey-api.d.ts",