diff options
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 5504e225..97da4e2c 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -15,26 +15,29 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic var loginData = ZMDataModel.getLogin(); if (ZMDataModel.isLoggedIn()) { - ZMDataModel.zmLog ("User credentials are provided"); - // console.log("VALID CREDENTIALS. Grabbing Monitors"); - ZMDataModel.zmDebug("PortalLogin: Authenticating"); - 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'); - } - + ZMDataModel.zmLog ("User credentials are provided"); + ZMDataModel.validatePin() + .then( function (data) { + - ); + // console.log("VALID CREDENTIALS. Grabbing Monitors"); + ZMDataModel.zmDebug("PortalLogin: Authenticating"); + 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 { |