homey-api 1.5.29 → 1.6.1

package/assets/specifications/AthomStoreAPI.json

@@ -394,7 +394,33 @@
           "type": "string",
           "required": true
         },
-        "provider": {
+        "paymentProvider": {
+          "type": "string",
+          "in": "body"
+        }
+      }
+    },
+    "createOfferCouponApple": {
+      "path": "/offer/coupon_apple",
+      "method": "post",
+      "parameters": {
+        "coupon": {
+          "type": "string",
+          "in": "body"
+        },
+        "expiresAt": {
+          "type": "string",
+          "in": "body"
+        },
+        "subscriptionType": {
+          "type": "string",
+          "in": "body"
+        },
+        "subscriptionQuantity": {
+          "type": "number",
+          "in": "body"
+        },
+        "subscriptionDuration": {
           "type": "string",
           "in": "body"
         }
@@ -417,6 +443,10 @@
           "type": "string",
           "in": "body"
         },
+        "campaignId": {
+          "type": "string",
+          "in": "body"
+        },
         "subscriptionType": {
           "type": "string",
           "in": "body"

package/assets/types/homey-api.d.ts

@@ -579,7 +579,7 @@
     
   }
 
-  export class StorageAdapterNodeJS extends StorageAdapter {
+  export class StorageAdapterMemory extends StorageAdapter {
     
 
     

package/assets/types/homey-api.private.d.ts

@@ -4738,7 +4738,42 @@
     
   
     
-      provider: string,
+      paymentProvider: string,
+    
+  
+},
+    
+  
+
+        
+      ):
+        Promise<any>;
+    
+      createOfferCouponApple(
+        
+          
+  
+    
+      opts: {
+  
+    
+      coupon: string,
+    
+  
+    
+      expiresAt: string,
+    
+  
+    
+      subscriptionType: string,
+    
+  
+    
+      subscriptionQuantity: number,
+    
+  
+    
+      subscriptionDuration: string,
     
   
 },
@@ -4770,6 +4805,10 @@
     
   
     
+      campaignId: string,
+    
+  
+    
       subscriptionType: string,
     
   
@@ -5598,6 +5637,15 @@
   
 
         
+      ):
+        boolean;
+    
+      isReactNative(
+        
+          
+  
+
+        
       ):
         boolean;
     
@@ -5805,7 +5853,7 @@
     
   }
 
-  export class StorageAdapterNodeJS extends StorageAdapter {
+  export class StorageAdapterMemory extends StorageAdapter {
     
 
     

package/lib/AthomCloudAPI/StorageAdapter.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /**
- * Abstract storage adapter. To be extended by your own, or {@link AthomCloudAPI.StorageAdapterBrowser} or {@link AthomCloudAPI.StorageAdapterNodeJS}.
+ * Abstract storage adapter. To be extended by your own, or {@link AthomCloudAPI.StorageAdapterBrowser} or {@link AthomCloudAPI.StorageAdapterMemory}.
  * @class
  * @memberof AthomCloudAPI
  */

package/lib/AthomCloudAPI/{StorageAdapterNodeJS.js → StorageAdapterMemory.js}

@@ -3,12 +3,12 @@
 const StorageAdapter = require('./StorageAdapter');
 
 /**
- * In-memory storage adapter for Node.js.
+ * In-memory storage adapter for Node.js or React Native.
  * @class
  * @extends StorageAdapter
  * @memberof AthomCloudAPI
  */
-class StorageAdapterNodeJS extends StorageAdapter {
+class StorageAdapterMemory extends StorageAdapter {
 
   constructor() {
     super();
@@ -34,4 +34,4 @@ class StorageAdapterNodeJS extends StorageAdapter {
 
 }
 
-module.exports = StorageAdapterNodeJS;
+module.exports = StorageAdapterMemory;

package/lib/AthomCloudAPI.js

@@ -9,7 +9,7 @@ const Homey = require('./AthomCloudAPI/Homey');
 const Token = require('./AthomCloudAPI/Token');
 const StorageAdapter = require('./AthomCloudAPI/StorageAdapter');
 const StorageAdapterBrowser = require('./AthomCloudAPI/StorageAdapterBrowser');
-const StorageAdapterNodeJS = require('./AthomCloudAPI/StorageAdapterNodeJS');
+const StorageAdapterMemory = require('./AthomCloudAPI/StorageAdapterMemory');
 
 class AthomCloudAPI extends API {
 
@@ -18,7 +18,7 @@ class AthomCloudAPI extends API {
   static Token = Token;
   static StorageAdapter = StorageAdapter;
   static StorageAdapterBrowser = StorageAdapterBrowser;
-  static StorageAdapterNodeJS = StorageAdapterNodeJS;
+  static StorageAdapterMemory = StorageAdapterMemory;
 
   static SPECIFICATION = require('../assets/specifications/AthomCloudAPI.json');
   static SPECIFICATION_URL = 'https://api.athom.com/specification.json';
@@ -75,7 +75,7 @@ for(const device of Object.values(devices)) {
 @param {string} opts.redirectUrl
 @param {boolean} [opts.autoRefreshTokens=true]
 @param {AthomCloudAPI.Token} [opts.token=null]
-@param {AthomCloudAPI.StorageAdapter} [opts.store={@link AthomCloudAPI.StorageAdapterBrowser} or {@link AthomCloudAPI.StorageAdapterNodeJS}]`;
+@param {AthomCloudAPI.StorageAdapter} [opts.store={@link AthomCloudAPI.StorageAdapterBrowser} or {@link AthomCloudAPI.StorageAdapterMemory}]`;
 
   constructor({
     clientId,
@@ -85,7 +85,7 @@ for(const device of Object.values(devices)) {
     token = null,
     store = Util.isBrowser()
       ? new StorageAdapterBrowser()
-      : new StorageAdapterNodeJS(),
+      : new StorageAdapterMemory(),
     ...args
   } = {}) {
     super({ ...args });
@@ -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/HomeyCloudAPI.js

@@ -1,9 +1,8 @@
 'use strict';
 
-const fetch = require('node-fetch');
-
 const API = require('./API');
 const APIError = require('./APIError');
+const Util = require('./Util');
 
 class HomeyCloudAPI extends API {
 
@@ -26,7 +25,7 @@ class HomeyCloudAPI extends API {
    * @returns {string} result.region - e.g. `eu-central-1`
    */
   static async getClosestRegion() {
-    const res = await fetch(`https://${HomeyCloudAPI.SPECIFICATION.host}`);
+    const res = await Util.fetch(`https://${HomeyCloudAPI.SPECIFICATION.host}`);
     if (!res.ok) {
       throw new Error(res.statusText || 'Unknown Error');
     }
@@ -56,7 +55,7 @@ class HomeyCloudAPI extends API {
    * @returns {Promise<object>} result
    */
   async getSystemStatus({ secret }) {
-    const res = await fetch(`${this.baseUrl}/api/system/status`, {
+    const res = await Util.fetch(`${this.baseUrl}/api/system/status`, {
       headers: {
         'X-Homey-Secret': secret,
       },

package/lib/Util.js

@@ -18,13 +18,22 @@ class Util {
    * @returns {Promise}
    */
   static async fetch(...args) {
-    // If in a browser
+    if (this.isReactNative()) {
+      return fetch(...args);
+    }
+
     if (this.isBrowser()) {
       return window.fetch(...args);
     }
 
-    const fetch = require('node-fetch');
-    return fetch(...args);
+    if (this.isNodeJS()) {
+      const fetch = require('node-fetch');
+      return fetch(...args);
+    }
+
+    if (typeof fetch !== 'undefined') {
+      return fetch(...args);
+    }
   }
 
   /**
@@ -81,17 +90,26 @@ class Util {
     return window.location.protocol === 'http:';
   }
 
+  /**
+   * @returns {boolean}
+   */
+  static isReactNative() {
+    return (typeof navigator !== 'undefined' && navigator.product === 'ReactNative');
+  }
+
   /**
    * @returns {boolean}
    */
   static isBrowser() {
-    return (typeof window !== 'undefined');
+    if (this.isReactNative()) return false;
+    return (typeof document !== 'undefined' && typeof document.window !== 'undefined');
   }
 
   /**
    * @returns {boolean}
    */
   static isNodeJS() {
+    if (this.isReactNative()) return false;
     return (typeof process !== 'undefined');
   }
 
@@ -119,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;
   }
 
   /**
@@ -161,6 +218,10 @@ class Util {
       return process.env[key] || null;
     }
 
+    if (this.isReactNative()) {
+      return null;
+    }
+
     return null;
   }
 

package/package.json

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