Merge pull request #819 from pliablepixels/api-tokens

Api tokens

1 files changed, 31 insertions, 37 deletions

diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 1279c013..d6411753 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -33,24 +33,6 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
   NVR.debug("MonitorModalCtrl called from " + $ionicHistory.currentStateName());
 
 
-  //no need to recompute auth in modal
-  /*$rootScope.validMonitorId = $scope.monitors[0].Monitor.Id;
-  NVR.getAuthKey($rootScope.validMonitorId, $scope.monitors[0].Monitor.connKey)
-    .then(function (success) {
-        $ionicLoading.hide();
-        $rootScope.authSession = success;
-        NVR.log("Modal: Stream authentication construction: " + $rootScope.authSession);
-
-      },
-      function (error) {
-
-        $ionicLoading.hide();
-        NVR.debug("ModalCtrl: Error details of stream auth:" + error);
-        //$rootScope.authSession="";
-        NVR.log("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
-      });
-*/
-
   $interval.cancel(intervalModalHandle);
   $interval.cancel(cycleHandle);
 
@@ -100,7 +82,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     $timeout(function () {
       var keyCode = evt.keyCode;
 
-      console.log(keyCode + " PRESSED");
+      //console.log(keyCode + " PRESSED");
 
       if (keyCode == keyCodes.ESC) {
 
@@ -437,7 +419,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     ];
     //console.log ("Inside Modal timer...");
     var apiurl = NVR.getLogin().apiurl;
-    var alarmurl = apiurl + "/monitors/alarm/id:" + $scope.monitorId + "/command:status.json";
+    var alarmurl = apiurl + "/monitors/alarm/id:" + $scope.monitorId + "/command:status.json?"+$rootScope.authSession;
     NVR.log("Invoking " + alarmurl);
 
     $http.get(alarmurl)
@@ -811,6 +793,11 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
       };
     }
 
+    if ($rootScope.authSession.indexOf("&token=")!=-1) {
+      ptzData.token=$rootScope.authSession.match(/&token=([^&]*)/)[1];
+    }
+
+
     //console.log("Command value " + cmd + " with MID=" + monitorId);
     //console.log("PTZDATA is " + JSON.stringify(ptzData));
     $ionicLoading.hide();
@@ -842,7 +829,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
           str.push(encodeURIComponent(p) + "=" +
             encodeURIComponent(obj[p]));
         var foo = str.join("&");
-        //console.log("****RETURNING " + foo);
+        //console.log("****PTZ RETURNING " + foo);
         return foo;
       },
 
@@ -1072,7 +1059,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     function triggerAlarm(mid, mode) {
       var apiurl = NVR.getLogin().apiurl;
       var c = mode == 'on' ? 'on' : 'off';
-      var alarmurl = apiurl + "/monitors/alarm/id:" + mid + "/command:" + c + ".json";
+      var alarmurl = apiurl + "/monitors/alarm/id:" + mid + "/command:" + c + ".json?"+$rootScope.authSession;
       NVR.log("Invoking " + alarmurl);
 
       var status = mode ? $translate.instant('kForcingAlarm') : $translate.instant('kCancellingAlarm');
@@ -1429,8 +1416,22 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     var CMD_QUERY = 99;
     */
 
-    var myauthtoken = $rootScope.authSession.replace("&auth=", "");
-    //&auth=
+   // var myauthtoken='';
+
+    var data_payload = {
+      view: "request",
+      request: "stream",
+      connkey: connkey,
+      command: cmd
+    };
+
+    if ($rootScope.authSession.indexOf("&auth=")!=-1) {
+      data_payload.auth=$rootScope.authSession.match(/&auth=([^&]*)/)[1];
+    }
+    else if ($rootScope.authSession.indexOf("&token=")!=-1) {
+      data_payload.token=$rootScope.authSession.match(/&token=([^&]*)/)[1];
+    }
+
     var req = $http({
       method: 'POST',
       /*timeout: 15000,*/
@@ -1445,25 +1446,18 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
           str.push(encodeURIComponent(p) + "=" +
             encodeURIComponent(obj[p]));
         var foo = str.join("&");
-        //console.log("****RETURNING " + foo);
+        //console.log("****CONTROL RETURNING " + foo);
         return foo;
       },
 
-      data: {
-        view: "request",
-        request: "stream",
-        connkey: connkey,
-        command: cmd,
-        auth: myauthtoken,
-
-      }
+      data: data_payload
     });
     req.then(function (resp) {
 
         resp = resp.data;
         if (resp.result == "Ok" && ndx != -1) {
           var ld = NVR.getLogin();
-          var apiurl = ld.apiurl + "/events/" + resp.status.event + ".json";
+          var apiurl = ld.apiurl + "/events/" + resp.status.event + ".json?"+$rootScope.authSession;
           //console.log ("API " + apiurl);
           $http.get(apiurl)
             .then(function (data) {
@@ -1558,7 +1552,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
     NVR.debug("configurePTZ: called with mid=" + mid);
     var ld = NVR.getLogin();
-    var url = ld.apiurl + "/monitors/" + mid + ".json";
+    var url = ld.apiurl + "/monitors/" + mid + ".json?"+$rootScope.authSession;
     $http.get(url)
       .then(function (data) {
           data = data.data;
@@ -1572,7 +1566,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
           if ($scope.isControllable == '1') {
 
             var apiurl = NVR.getLogin().apiurl;
-            var myurl = apiurl + "/controls/" + $scope.controlid + ".json";
+            var myurl = apiurl + "/controls/" + $scope.controlid + ".json?"+$rootScope.authSession;
             NVR.debug("configurePTZ : getting controllable data " + myurl);
 
             $http.get(myurl)
@@ -1758,7 +1752,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
   function getZones() {
     //https://server/zm/api/zones/forMonitor/7.json
-    var api = NVR.getLogin().apiurl + "/zones/forMonitor/" + $scope.monitorId + ".json";
+    var api = NVR.getLogin().apiurl + "/zones/forMonitor/" + $scope.monitorId + ".json?"+$rootScope.authSession;
     NVR.debug("Getting zones using:" + api);
     originalZones = [];
     $http.get(api)