summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rwxr-xr-xwww/js/app.js51
1 files changed, 1 insertions, 50 deletions
diff --git a/www/js/app.js b/www/js/app.js
index dac1eee4..0cd1ddb7 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -925,18 +925,6 @@ angular.module('zmApp', [
var d = $q.defer();
var ld = NVRDataModel.getLogin();
- /*$rootScope.authSession = 'Test';
- $rootScope.apiAuth = true;
- d.resolve ("Login Success");
- $rootScope.loggedIntoZm = 1;
- $rootScope.$emit('auth-success', 'hash API mode');
-
- console.log(">>>>>>>>>>> DO LOGIN");
- if (1) {return (d.promise);}*/
-
-
-
-
NVRDataModel.processFastLogin()
// coming here means login not needed, old login is valid
.then(function (success) {
@@ -1067,44 +1055,7 @@ angular.module('zmApp', [
});
var loginData = NVRDataModel.getLogin();
- // console.log(">>>>>>>>>>>>>> PARALLEL POST WITH RECAPTCHA TO " + loginData.url);
-
- /* console.log ("-----------------------SECRET IS "+zm.hashSecret);
- $http.get (ld.apiurl+'/host/remoteIp.json')
- .then (function (data) {
- $ionicLoading.hide();
- var ip = (data.data.auth_hash_ip) ? data.data.remote_ip: "";
- var composite = zm.hashSecret + ld.username + ld.password + ip + data.data.time_frag;
- var hash = CryptoJS.MD5(composite);
- console.log ("MD5 HASH IS "+hash);
- $rootScope.authSession = hash;
- d.resolve ("Login Success");
- $rootScope.loggedIntoZm = 1;
- $rootScope.$emit('auth-success', data);
-
-
- //ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5]
- //$rootScope.authSession
- // data.data.remote_ip
- // data.data.is_auth
-
- console.log (JSON.stringify(data));
- },
- function (error) {
- $ionicLoading.hide();
- console.log (JSON.stringify(error));
- $rootScope.authSession = "";
- d.reject ("Login Error");
- $rootScope.loggedIntoZm = 1;
- $rootScope.$emit('auth-error', "incorrect credentials");
- }
-
- );
-
- return (d.promise);
-
- console.log ("*****************NEVER HERE***********");
- */
+
var hDelay = loginData.enableSlowLoading ? zm.largeHttpTimeout : zm.httpTimeout;
//NVRDataModel.debug ("*** AUTH LOGIN URL IS " + loginData.url);
$http({