#635 promise cleanup

ZoneMinder · May 24, 2018 · e5d36a0 · e5d36a0
1 parent 8b7ca64
commit e5d36a0
Show file tree

Hide file tree

Showing 4 changed files with 241 additions and 250 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.001" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.002" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
@@ -1594,12 +1594,15 @@ angular.module('zmApp.controllers')
         },
 
         isReCaptcha: function () {
+          // always resolves
           var d = $q.defer();
 
           var myurl = loginData.url;
           log("Checking if reCaptcha is enabled in ZM...");
+          console.log ("Recaptcha: "+myurl);
           $http.get(myurl)
             .then(function (success) {
+              console.log ("Inside recaptcha success");
               if (success.data.search("g-recaptcha") != -1) {
                 // recaptcha enable. zmNinja won't work
                 log("ZM has recaptcha enabled", "error");
@@ -1612,6 +1615,13 @@ angular.module('zmApp.controllers')
                 log("ZM has recaptcha disabled - good");
                 return (d.promise);
               }
+            },
+            function (err) {
+              // for whatever reason recaptcha check failed
+              console.log ("Inside recaptcha fail");
+              d.resolve(false);
+                log("Recaptcha failed, but assuming ZM has recaptcha disabled");
+                return (d.promise);
             });
           return (d.promise);
         },

diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
@@ -601,6 +601,8 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
       .then(function (data) {
 
+        console.log ("DOLOGIN RETURNED "+ JSON.stringify(data));
+
         // Now let's validate if the API works
 
         // note that due to reachability, it might have switched to another server