fixes #829

3 files changed, 21 insertions, 21 deletions

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index c2bc8d3b..60b49541 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -686,7 +686,7 @@ angular.module('zmApp.controllers')
 
         },
         function (err) {
-            NVR.debug ("event status load failed: "+JSON.stringify(data));
+            NVR.debug ("event status load failed: "+JSON.stringify(err));
         });
     
 
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 6f9fad88..e31fc52f 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -474,6 +474,7 @@ angular.module('zmApp.controllers')
                   loginData.accessToken = succ.access_token;
                   loginData.accessTokenExpires = moment.utc().add(succ.access_token_expires, 'seconds');
                   loginData.refreshToken = succ.refresh_token;
+                  $rootScope.tokenExpires = succ.access_token_expires;
                 
                   loginData.refreshTokenExpires = moment.utc().add(succ.refresh_token_expires, 'seconds');
               
@@ -531,7 +532,7 @@ angular.module('zmApp.controllers')
                
                 loginData.loginAPISupported = false;
                 loginData.isTokenSupported = false;
-                setLogin(ld);
+                setLogin(loginData);
                 loginWebScrape()
                   .then(function () {
                       d.resolve("Login Success");
@@ -2248,6 +2249,11 @@ angular.module('zmApp.controllers')
         isReCaptcha: function () {
           // always resolves
           var d = $q.defer();
+          if (loginData.isTokenSupported) {
+            debug ('No need for re-captcha checks with tokens');
+            d.resolve(false);
+            return (d.promise);
+          }
 
           var myurl = loginData.url;
           log("Checking if reCaptcha is enabled in ZM...");
@@ -2872,6 +2878,7 @@ angular.module('zmApp.controllers')
               log ("Access token still has "+diff_access+" minutes left, using it");
              // console.log ("**************** TOKEN SET="+loginData.accessToken);
               $rootScope.authSession = '&token='+loginData.accessToken;
+              $rootScope.tokenExpires = 
               d.resolve("Login success via access token");
               if (!noBroadcast) $rootScope.$broadcast('auth-success', ''  );
               return d.promise;
@@ -2894,6 +2901,7 @@ angular.module('zmApp.controllers')
                   log ("New access token retrieved: ..."+succ.access_token.substr(-5));
                   loginData.accessToken = succ.access_token;
                   loginData.accessTokenExpires = moment.utc().add(succ.access_token_expires,'seconds');
+                  $rootScope.tokenExpires = succ.access_token_expires;
                   log ("Current time is: UTC "+moment.utc().format("YYYY-MM-DD hh:mm:ss"));
                   log ("New access token expires on: UTC "+loginData.accessTokenExpires.format("YYYY-MM-DD hh:mm:ss"));
                   log ("New access token expires on:"+loginData.accessTokenExpires.format("YYYY-MM-DD hh:mm:ss"));
diff --git a/www/js/app.js b/www/js/app.js
index 30cbb6e8..550d3de9 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -113,7 +113,9 @@ angular.module('zmApp', [
     versionWithLoginAPI: "1.31.47",
     androidBackupKey: "AEdPqrEAAAAIqF-OaHdwIzZhx2L1WOfAGTagBxm5a1R4wBW_Uw",
     accessTokenLeewayMin: 5,
-    refreshTokenLeewayMin: 10
+    refreshTokenLeewayMin: 10,
+    defaultAccessTokenExpiresMs: 30000
+    //defaultAccessTokenExpiresMs: 1800000 // half of 3600s
 
   })
 
@@ -1097,27 +1099,17 @@ angular.module('zmApp', [
   
 
     }
-
-
- 
-
     function start() {
       var ld = NVR.getLogin();
       // lets keep this timer irrespective of auth or no auth
       //$rootScope.loggedIntoZm = 0;
-
-      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");
-      }
+      var timeInterval = ld.isTokenSupported ? zm.defaultAccessTokenExpiresMs: zm.loginInterval;
+      $interval.cancel(zmAutoLoginHandle);
+      //doLogin();
+      NVR.debug ('We will relogin every '+timeInterval/1000+' seconds, token supported='+ld.isTokenSupported)
+      zmAutoLoginHandle = $interval(function () {
+        _doLogin("");
+      }, timeInterval); 
         
 
     }
@@ -1900,7 +1892,7 @@ angular.module('zmApp', [
           NVR.init();
           zmCheckUpdates.start();
          // NVR.log("Setting up POST LOGIN timer");
-          zmAutoLogin.start();
+          
           setupPauseAndResume();
 
         }