pushy-electron 1.0.15 → 1.0.17

package/lib/Pushy.d.ts

@@ -28,8 +28,12 @@ declare namespace Pushy {
 
     function isEnterpriseConfigured(): boolean
 
+    function setDeviceCredentials(token: string, auth: string): void
+
     function setEnterpriseConfig(endpoint: string, mqttEndpoint: string): void
 
+    function mTLS(config: object): void
+
     function disconnect(): void
 
     function alert(win: BrowserWindow, msg: string): void

package/lib/Pushy.js

@@ -88,7 +88,7 @@ module.exports = {
 
         try {
             // Register the device
-            response = await api.post('/register', postData);
+            response = await api.post('/register', postData, this.mTLSConfig);
         }
         catch (e) {
             // Registration failed
@@ -147,7 +147,7 @@ module.exports = {
 
         try {
             // Subscribe to topic(s)
-            response = await api.post('/devices/subscribe', postData);
+            response = await api.post('/devices/subscribe', postData, this.mTLSConfig);
         }
         catch (e) {
             // Request failed
@@ -183,7 +183,7 @@ module.exports = {
 
         try {
             // Unsubscribe from topic(s)
-            response = await api.post('/devices/unsubscribe', postData);
+            response = await api.post('/devices/unsubscribe', postData, this.mTLSConfig);
         }
         catch (e) {
             // Request failed
@@ -214,7 +214,7 @@ module.exports = {
 
         try {
             // Authenticate the device
-            response = await api.post('/devices/auth', postData);
+            response = await api.post('/devices/auth', postData, this.mTLSConfig);
         }
         catch (e) {
             // Request failed
@@ -242,6 +242,11 @@ module.exports = {
         localStorage.set(config.storageKeys.keepAliveInt, seconds);
     },
 
+    mTLS(config) {
+        // Store in Pushy object for later
+        this.mTLSConfig = config;
+    },
+
     setEnterpriseConfig(endpoint, mqttEndpoint) {
         // Clear requested?
         if (!endpoint || !mqttEndpoint) {
@@ -283,6 +288,12 @@ module.exports = {
         }
     },
 
+    setDeviceCredentials(token, auth) {
+        // Manually set token & auth key
+        localStorage.set(config.storageKeys.token, token);
+        localStorage.set(config.storageKeys.tokenAuth, auth);
+    },
+
     disconnect() {
         // Attempt to disconnect from Pushy
         mqtt.disconnect(this);

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "pushy-electron",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -6,7 +6,7 @@
   "main": "lib/Pushy.js",
   "typings": "lib/Pushy.d.ts",
   "//": "Also update version in config.js",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "scripts": {
     "dev": "electron electron.js"
   },

package/util/api.js

@@ -1,16 +1,18 @@
+const https = require('https');
 const config = require('../config');
 const localStorage = require('./storage');
 const fetch = require('node-fetch').default; // Workaround for #2: https://github.com/pushy/pushy-electron/issues/2
 
 module.exports = {
-    async get(path, options) {
-        // Nothing special to do here, simply send the request
-        return await this.execute(path, options || {});
-    },
-
-    async post(path, json, options) {
+    async post(path, json, mTLS) {
         // Default request options
-        options = options || {};
+        let options = {};
+
+        // mTLS configured?
+        if (mTLS) {
+            // Prepare HTTPS agent with config
+            options.agent = https.Agent(mTLS);
+        }
 
         // Set POST request options
         options.method = 'POST';

package/util/mqtt.js

@@ -112,6 +112,19 @@ module.exports = {
         let keepAlive = localStorage.get(config.storageKeys.keepAliveInt) || config.mqtt.defaultKeepAlive;
 
         // MQTT connection options
-        return { keepalive: keepAlive, username: token, password: tokenAuth, clientId: token };
+        let options = { keepalive: keepAlive, username: token, password: tokenAuth, clientId: token };
+
+        // mTLS support
+        let mTLS = this.Pushy.mTLSConfig;
+        
+        // mTLS support
+        if (mTLS) {
+            options.ca = mTLS.ca;
+            options.key = mTLS.key;
+            options.cert = mTLS.cert;
+        }
+
+        // Return options
+        return options;
     }
 }