From c6b9e67c448c0b5619857af8e1431703fe15502e Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 24 Dec 2016 08:00:47 -0500
Subject: If API access errors, notify the user with a link to the FAQ #415

---
 www/js/PortalLoginCtrl.js | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'www/js/PortalLoginCtrl.js')

diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 95eb72d4..6a9a9f2d 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -173,7 +173,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                     return;
                                 }
 
-                                if (data == "0.0.0")
+                                /*if (data == "0.0.0")
                                 {
 
                                     NVRDataModel.log("2nd Auth:API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
@@ -183,7 +183,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                         "wizard": false
                                     });
                                     return;
-                                }
+                                }*/
                                 // coming here means continue
                                 EventServer.refresh();
 
@@ -287,8 +287,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                     {
                         NVRDataModel.debug("PortalLogin: auth success");
 
-                        NVRDataModel.getKeyConfigParams(1);
-                        NVRDataModel.getTimeZone();
+                        
                         // $state.go("login" ,{"wizard": false});
                         //login was ok, so get API details
                         NVRDataModel.getAPIversion()
@@ -319,7 +318,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                         return;
                                     }
 
-                                    if (data == "0.0.0")
+                                    /*if (data == "0.0.0")
                                     {
 
                                         NVRDataModel.log("API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
@@ -330,9 +329,12 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                         });
                                         return;
 
-                                    }
+                                    }*/
                                     // coming here means continue
                                     // console.log (">>>>>>>>>>>>>>>>>>>>>>>>>NEVER");
+                                    
+                                    NVRDataModel.getKeyConfigParams(1);
+                                    NVRDataModel.getTimeZone();
                                     EventServer.refresh();
                                     if ($rootScope.tappedNotification != 1)
                                     {
@@ -367,11 +369,23 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                                 },
                                                 function error(e)
                                                 {
-                                                    $state.go("login",
+
+                                                    if ($rootScope.apiValid == true)
+                                                    {
+                                                        $state.go("login",
+                                                        {
+                                                            "wizard": false
+                                                        });
+                                                        return;
+                                                    }
+                                                    else
                                                     {
-                                                        "wizard": false
-                                                    });
+                                                        $state.go("invalidapi");
+                                                        return;
+                                                    }
+                                                        
                                                 });
+                                                    
                                         return;
 
                                     }, 1000);
-- 
cgit v1.2.3