From fad1846bc42f42e81c471099eb9ebd5be717e7be Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Wed, 23 Mar 2016 14:21:54 -0400
Subject: #208 - first login, then do reachability

Former-commit-id: 09fb5b533a3d78bd18eed99240c35f982b8c5a2e
---
 www/js/app.js | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'www/js')

diff --git a/www/js/app.js b/www/js/app.js
index f43c1b4f..26a3a92d 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -752,9 +752,35 @@ angular.module('zmApp', [
                 return d.promise;
                 
             }
+        // first try to login, if it works, good
+        // else try to do reachability
+        proceedWithLogin()
+        .then (function (success)
+               {
+                    d.resolve (success);
+                    return d.promise;
+               },
+               function (error)
+               // login to main failed, so try others
+               {
+                    ZMDataModel.getReachableConfig()
+                    .then (function (data)
+                    {
+                        proceedWithLogin()
+                        .then (function(success)
+                           { d.resolve(success); return d.promise;},
+                           function(error)
+                           {  d.reject(error); return d.promise;});
+                        
+                    },
+                    function (error)
+                    {
+                        d.reject(error); return d.promise;
+                    });
+                        
+                });
         
-        
-        ZMDataModel.getReachableConfig()
+        /*ZMDataModel.getReachableConfig()
         .then (function (data)
                {
                     ZMDataModel.zmLog ("REACHABILITY SUCCESS " + JSON.stringify(data));
@@ -769,9 +795,7 @@ angular.module('zmApp', [
                {
                     ZMDataModel.zmLog ("REACHABILITY ERROR " + JSON.stringify(error));
                     ZMDataModel.zmLog ("Still trying to proceed with " + ZMDataModel.getLogin().serverName);
-                    /*
-                    d.reject (error);
-                    return d.promise;*/
+                    
                     proceedWithLogin()
                     .then (function(success)
                            { d.resolve(success); return d.promise;},
@@ -779,7 +803,7 @@ angular.module('zmApp', [
                            {  d.reject(error); return d.promise;});
                    
                     
-               });
+               });*/
         return d.promise;
         
                
-- 
cgit v1.2.3