fix "no such state invalidapi" and other api auth border cases

2 files changed, 3 insertions, 1 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index b86c6f08..2e7279ad 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1594,6 +1594,7 @@ angular.module('zmApp.controllers')
                   setCurrentServerVersion(success.data.version);
                   d.resolve(success.data.version);
                 } else {
+                  debug ("Setting APIValid to false as API version was not retrieved");
                   $rootScope.apiValid = false;
                   setCurrentServerVersion("");
                   d.reject("-1.-1.-1");
diff --git a/www/js/app.js b/www/js/app.js
index 87f40674..c5c9c8ba 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1018,7 +1018,8 @@ angular.module('zmApp', [
 
         // This is a good time to check if auth is used :-p
         if (!ld.isUseAuth) {
-          NVRDataModel.log("Auth is disabled, setting authSession to ''");
+          NVRDataModel.log("Auth is disabled, setting authSession to empty");
+          $rootScope.apiValid = true;
           $rootScope.authSession = '';
           d.resolve("Login Success");