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/MontageHistoryCtrl.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'www/js/MontageHistoryCtrl.js') diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 6f6687e4..567c8590 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -264,7 +264,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc function getNextSetHistory() { // grab events that start on or after the time - apiurl = ld.apiurl + "/events/index/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?sort=StartTime&direction=asc"; + apiurl = ld.apiurl + "/events/index/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?sort=StartTime&direction=asc"+$rootScope.authSession; NVR.log("Grabbing history using: " + apiurl); // make sure there are no more than 5 active streams (noevent is ok) $scope.currentLimit = $scope.monLimit; @@ -357,7 +357,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc for (i = 0; i < $scope.MontageMonitors.length; i++) { //console.log("Fair chance check for " + $scope.MontageMonitors[i].Monitor.Name); if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noimage.png') { - var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json"; + var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?"+$rootScope.authSession; NVR.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab); var p = getExpandedEvents(i, indivGrab); promises.push(p); @@ -655,7 +655,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc // $scope.MontageMonitors[ndx].Monitor.sliderProgress.progress = 0; NVR.debug("Fetching details, as event changed for " + $scope.MontageMonitors[ndx].Monitor.Name + " from " + $scope.MontageMonitors[ndx].Monitor.eid + " to " + resp.status.event); 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); qHttp({ method: 'get', @@ -998,7 +998,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var d = $q.defer(); // now get event details to show alarm frames var loginData = NVR.getLogin(); - var myurl = loginData.apiurl + '/events/' + eid + ".json"; + var myurl = loginData.apiurl + '/events/' + eid + ".json?"+$rootScope.authSession; //console.log (">> 1: getting: "+myurl); var r = { @@ -1021,7 +1021,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc else { r.eid = target; // now get time of that event - myurl = loginData.apiurl+'/events/'+target + '.json'; + myurl = loginData.apiurl+'/events/'+target + '.json?'+$rootScope.authSession; $http.get (myurl) .then (function (succ) { r.stime = succ.data.event.Event.StartTime; -- 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/MontageHistoryCtrl.js | 50 ++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) (limited to 'www/js/MontageHistoryCtrl.js') diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 567c8590..1f42e98e 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -531,7 +531,21 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc function subControlStream(cmd, connkey) { var loginData = NVR.getLogin(); - var myauthtoken = $rootScope.authSession.replace("&auth=", ""); + + 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]; + } + //&auth= var req = qHttp({ method: 'POST', @@ -544,17 +558,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var str = []; for (var p in obj) str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p])); var foo = str.join("&"); - //console.log("****SUB RETURNING " + foo); + console.log("****HISTORY CONTROL RETURNING " + foo); return foo; }, - data: { - view: "request", - request: "stream", - connkey: connkey, - command: cmd, - auth: myauthtoken, // user: loginData.username, - // pass: loginData.password - } + data: data_payload }); req.then(function (succ) { NVR.debug("subControl success:" + JSON.stringify(succ)); @@ -614,28 +621,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc url:cmdUrl }); - /* var req = qHttp({ - method: 'POST', - url: loginData.url + '/index.php?view=console', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - }, - transformRequest: function (obj) { - var str = []; - for (var p in obj) str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p])); - var foo = str.join("&"); - if (extras) foo = foo + extras; - return foo; - }, - data: { - view: "request", - request: "stream", - connkey: connkey, - command: cmd, - auth: myauthtoken, // user: loginData.username, - // pass: loginData.password - } - });*/ + req.then(function (succ) { var resp = succ.data; -- 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/MontageHistoryCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/MontageHistoryCtrl.js') diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 1f42e98e..1833ec80 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -540,10 +540,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc }; 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]; } //&auth= -- 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/MontageHistoryCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/MontageHistoryCtrl.js') diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 1833ec80..7888c37c 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -558,7 +558,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var str = []; for (var p in obj) str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p])); var foo = str.join("&"); - console.log("****HISTORY CONTROL RETURNING " + foo); + //console.log("****HISTORY CONTROL RETURNING " + foo); return foo; }, data: data_payload @@ -625,7 +625,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc req.then(function (succ) { var resp = succ.data; - console.log ("zms response: " + JSON.stringify(resp)); + //console.log ("zms response: " + JSON.stringify(resp)); // move progress bar if event id is the same if (resp.result == "Ok" && ndx != -1 && (resp.status && resp.status.event == $scope.MontageMonitors[ndx].Monitor.eid)) { -- cgit v1.2.3 From 3b38f53d06d41d3fc9246786d8ee25c422406462 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 20 May 2019 11:52:24 -0400 Subject: more logs demotion --- www/js/MontageHistoryCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/MontageHistoryCtrl.js') diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 7888c37c..50061d0d 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -277,7 +277,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var data = succ.data; var ld = NVR.getLogin(); NVR.debug("Got " + data.events.length + "new history events..."); - console.log (JSON.stringify(data)); + //console.log (JSON.stringify(data)); var eid, mid, stime; for (i = 0; i < data.events.length; i++) { mid = data.events[i].Event.MonitorId; -- cgit v1.2.3