Fixed the colossal crap that was PIN code auth. Still need to clean up rough edges but overall looks good now

1 files changed, 68 insertions, 7 deletions

diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 97da4e2c..11f7543b 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -12,17 +12,74 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     disableBack: true
   });
     
+    $scope.pindata = {};
+    if ($ionicSideMenuDelegate.isOpen())
+    {
+        $ionicSideMenuDelegate.toggleLeft();
+        ZMDataModel.zmDebug("Sliding menu close");
+    }
+    
+    $scope.pinChange = function()
+    {
+        
+        console.log ($scope.pindata.pin);
+        if ($scope.pindata.pin == null)
+        {
+            console.log ("Empty");
+            $scope.pindata.status="";
+        }
+    };
+    
+    $scope.unlock = function()
+    {
+        ZMDataModel.zmDebug("Trying to unlock PIN");
+        if ($scope.pindata.pin == loginData.pinCode)
+        {
+            ZMDataModel.zmDebug ("PIN code entered is correct");
+            $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
+            zmAutoLogin.stop(); //safety
+            zmAutoLogin.start();
+            zmAutoLogin.doLogin("authenticating...")
+                .then (function(data) // success
+                       {
+                         ZMDataModel.zmDebug("PortalLogin: auth success");
+                         ZMDataModel.getKeyConfigParams(1);
+                        $state.go('montage');
+                },
+                       // coming here means auth error
+                       // so go back to login
+                function (error)
+                {
+                        ZMDataModel.zmDebug("PortalLogin: error authenticating " +
+                                            JSON.stringify(error));
+                        $state.go('login');
+                });
+        }
+        else
+        {
+            $scope.pindata.status = "Invalid PIN";
+        }
+    };
+    
     var loginData = ZMDataModel.getLogin();
+    $scope.pinPrompt = false;
 
     if (ZMDataModel.isLoggedIn()) {
         ZMDataModel.zmLog ("User credentials are provided");
-        ZMDataModel.validatePin()
-        .then( function (data) {
         
-              
-              // console.log("VALID CREDENTIALS. Grabbing Monitors");
-                ZMDataModel.zmDebug("PortalLogin: Authenticating");
-                zmAutoLogin.doLogin("authenticating...")
+        if (loginData.usePin)
+        {
+            $scope.pinPrompt = true;
+            
+            
+        }
+        else{
+            
+            ZMDataModel.zmDebug ("PIN code not set");
+            $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
+            zmAutoLogin.stop(); //safety
+            zmAutoLogin.start();
+            zmAutoLogin.doLogin("authenticating...")
                 .then (function(data) // success
                        {
                          ZMDataModel.zmDebug("PortalLogin: auth success");
@@ -37,7 +94,11 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                             JSON.stringify(error));
                         $state.go('login');
                 });
-        });
+            
+            
+        }
+        
+        
     }
     else
     {