From 576d9058a4afb2a179f8c6a338f9b6c08108822b Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 14 May 2019 13:33:00 -0400 Subject: initial support for tokens #817 --- www/js/MonitorModalCtrl.js | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) (limited to 'www/js/MonitorModalCtrl.js') diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 1279c013..bb8b3f8f 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); @@ -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) @@ -1072,7 +1054,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'); @@ -1430,6 +1412,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ */ var myauthtoken = $rootScope.authSession.replace("&auth=", ""); + //&auth= var req = $http({ method: 'POST', @@ -1463,7 +1446,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ 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 +1541,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 +1555,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 +1741,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) -- cgit v1.2.3 From eb327c9b7cbca93c7fee43b3a25e47112ba7c595 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 15 May 2019 09:57:02 -0400 Subject: add token support to PTZ and stream control #817 --- www/js/MonitorModalCtrl.js | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'www/js/MonitorModalCtrl.js') diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index bb8b3f8f..ed86d088 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -793,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(); @@ -824,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; }, @@ -1411,9 +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,*/ @@ -1428,18 +1446,11 @@ 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) { -- cgit v1.2.3 From 12c8516a9f8151f22588d4a0fb42530b85265c6f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 18 May 2019 13:29:28 -0400 Subject: #817 various intercept fixes --- www/js/MonitorModalCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/js/MonitorModalCtrl.js') diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index ed86d088..169a8b4a 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -794,7 +794,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ } if ($rootScope.authSession.indexOf("&token=")!=-1) { - ptzData['token']=$rootScope.authSession.match(/&token=([^&]*)/)[1]; + ptzData.token=$rootScope.authSession.match(/&token=([^&]*)/)[1]; } @@ -1426,10 +1426,10 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ }; if ($rootScope.authSession.indexOf("&auth=")!=-1) { - data_payload['auth']=$rootScope.authSession.match(/&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]; + data_payload.token=$rootScope.authSession.match(/&token=([^&]*)/)[1]; } var req = $http({ -- cgit v1.2.3 From 5aee4039af90cc6b5c372076daa1d5ada9596075 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 20 May 2019 10:43:06 -0400 Subject: demote logs --- www/js/MonitorModalCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/js/MonitorModalCtrl.js') diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 169a8b4a..d6411753 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -82,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) { @@ -829,7 +829,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p])); var foo = str.join("&"); - console.log("****PTZ RETURNING " + foo); + //console.log("****PTZ RETURNING " + foo); return foo; }, @@ -1446,7 +1446,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p])); var foo = str.join("&"); - console.log("****CONTROL RETURNING " + foo); + //console.log("****CONTROL RETURNING " + foo); return foo; }, -- cgit v1.2.3