From 2965a63388508a58ba141e743092661f6ebf6601 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 15 May 2019 14:23:09 -0400 Subject: #817 no need to relogin with timer for tokens --- www/js/app.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/www/js/app.js b/www/js/app.js index c8e59138..9df47f23 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1480,14 +1480,20 @@ angular.module('zmApp', [ var ld = NVR.getLogin(); // lets keep this timer irrespective of auth or no auth //$rootScope.loggedIntoZm = 0; - $interval.cancel(zmAutoLoginHandle); - //doLogin(); - zmAutoLoginHandle = $interval(function () { - _doLogin(""); - }, zm.loginInterval); // Auto login every 5 minutes - // PHP timeout is around 10 minutes - // should be ok? + if (!ld.isTokenSupported) { + $interval.cancel(zmAutoLoginHandle); + //doLogin(); + zmAutoLoginHandle = $interval(function () { + _doLogin(""); + + }, zm.loginInterval); // Auto login every 5 minutes + // PHP timeout is around 10 minutes + // should be ok? + } else { + NVR.log ("Disabling login timer, as we are using tokens"); + } + } -- cgit v1.2.3