diff options
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 8 | ||||
| -rwxr-xr-x | www/js/app.js | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 2323c27e..78d24772 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -346,9 +346,7 @@ angular.module('zmApp.controllers') return d.promise; } - // disable for now, getAuthHash needs work - - if (versionCompare(currentServerVersion, "1.31.44") != -1 || loginData.loginAPISupported) { + if (versionCompare(currentServerVersion, zm.versionWithLoginAPI) != -1 || loginData.loginAPISupported) { myurl = loginData.apiurl + '/host/getCredentials.json'; debug("Server version > 1.31.41, so using getCredentials API:" + myurl); @@ -384,7 +382,7 @@ angular.module('zmApp.controllers') return d.promise; } - //currentServerVersion + //old way without login API var as = 'undefined'; @@ -2638,7 +2636,7 @@ angular.module('zmApp.controllers') $rootScope.authSession = "undefined"; - if (versionCompare(currentServerVersion, "1.31.44") != -1 || loginData.loginAPISupported) { + if (versionCompare(currentServerVersion, zm.versionWithLoginAPI) != -1 || loginData.loginAPISupported) { debug ("Logging out using API method"); $http.get(loginData.apiurl+'/host/logout.json') diff --git a/www/js/app.js b/www/js/app.js index eb9b48ca..ec757b47 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -103,14 +103,14 @@ angular.module('zmApp', [ maxGifCount2: 100, maxGifWidth: 800.0, quantSample: 15, - hashSecret: 'unused at the moment', forceMontageReloadDelay: 4500000, // 1 hr 15m, //forceMontageReloadDelay: 10000, // testing 10s thumbWidth: 200, alarmStatusTime: 10000, eventServerErrorDelay: 5000, // time to wait till I report initial connect errors zmVersionCheckNag: 60 * 24, // in hrs - waitTimeTillResume: 5 // in sec, for ES error + waitTimeTillResume: 5, // in sec, for ES error + versionWithLoginAPI: "1.31.44" }) |