JS API - Change auth header for ApiKEY

OpenDevice · Aug 5, 2018 · 3339217 · 3339217
1 parent 1794d7a
commit 3339217
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/opendevice-clients/opendevice-js/dist/js/opendevice.js b/opendevice-clients/opendevice-js/dist/js/opendevice.js
@@ -28,7 +28,7 @@ od.DeviceType = {
     BOARD:10,
     MANAGER:11,
 
-    isNumeric : function(type){
+    isAnalog : function(type){
         return type == od.DeviceType.ANALOG
         || type == od.DeviceType.FLOAT2
         || type == od.DeviceType.FLOAT4
@@ -129,7 +129,7 @@ od.CommandStatus = {
 od.Event = {
     DEVICE_LIST_UPDATE : "devicesUpdate",
     DEVICE_CHANGED : "deviceChanged",
-    CONNECTION_CHANGE : "connectionCgange",
+    CONNECTION_CHANGE : "connectionChange",
     CONNECTED : "connected",
     DISCONNECTED : "disconnected",
     LOGIN_FAILURE : "loginFail"
@@ -197,6 +197,7 @@ od.Device = function(data){
             }
         });
     };
+
     function notifyListeners(){
 
     }
@@ -258,7 +259,7 @@ od.Device = function(data){
 
     /**
      * Register a listener to monitor changes in this Device.
-     * @param {function} listener
+     * @param {function} listener - Receive params VALUE, ID
      * @param {Object} [context] - Context to execute listener
      * @returns {{context: *, listener: *}} - return registred listener (used in #removeListener)
      */
@@ -1152,6 +1153,10 @@ return {
         od.appID = appID;
     },
 
+    setApyKey : function(appID){
+        od.appID = appID;
+    },
+
     setServer : function(serverURL){
         od.serverURL = serverURL;
     },
@@ -1168,7 +1173,7 @@ return {
             type: "GET",
             url: od.serverURL + path,
             headers : {
-                'Authorization' : "Bearer " + od.appID
+                'Authorization' : "ApiKey " + od.appID
             },
             async: false // FIXME: isso não é recomendado...
         };

diff --git a/opendevice-clients/opendevice-js/dist/js/opendevice.min.js b/opendevice-clients/opendevice-js/dist/js/opendevice.min.js
diff --git a/opendevice-clients/opendevice-js/src/js/Constants.js b/opendevice-clients/opendevice-js/src/js/Constants.js
@@ -28,7 +28,7 @@ od.DeviceType = {
     BOARD:10,
     MANAGER:11,
 
-    isNumeric : function(type){
+    isAnalog : function(type){
         return type == od.DeviceType.ANALOG
         || type == od.DeviceType.FLOAT2
         || type == od.DeviceType.FLOAT4
@@ -129,7 +129,7 @@ od.CommandStatus = {
 od.Event = {
     DEVICE_LIST_UPDATE : "devicesUpdate",
     DEVICE_CHANGED : "deviceChanged",
-    CONNECTION_CHANGE : "connectionCgange",
+    CONNECTION_CHANGE : "connectionChange",
     CONNECTED : "connected",
     DISCONNECTED : "disconnected",
     LOGIN_FAILURE : "loginFail"

diff --git a/opendevice-clients/opendevice-js/src/js/Device.js b/opendevice-clients/opendevice-js/src/js/Device.js
@@ -62,6 +62,7 @@ od.Device = function(data){
             }
         });
     };
+
     function notifyListeners(){
 
     }
@@ -123,7 +124,7 @@ od.Device = function(data){
 
     /**
      * Register a listener to monitor changes in this Device.
-     * @param {function} listener
+     * @param {function} listener - Receive params VALUE, ID
      * @param {Object} [context] - Context to execute listener
      * @returns {{context: *, listener: *}} - return registred listener (used in #removeListener)
      */

diff --git a/opendevice-clients/opendevice-js/src/js/OpenDeviceJS.js b/opendevice-clients/opendevice-js/src/js/OpenDeviceJS.js
@@ -61,6 +61,10 @@ return {
         od.appID = appID;
     },
 
+    setApyKey : function(appID){
+        od.appID = appID;
+    },
+
     setServer : function(serverURL){
         od.serverURL = serverURL;
     },
@@ -77,7 +81,7 @@ return {
             type: "GET",
             url: od.serverURL + path,
             headers : {
-                'Authorization' : "Bearer " + od.appID
+                'Authorization' : "ApiKey " + od.appID
             },
             async: false // FIXME: isso não é recomendado...
         };