Fixing bug with login persistence

Caio Almeida
1 parent aeb85a1e
Showing 5 changed files with 15 additions and 18 deletions Show diff stats
ConfJuvApp/builds/confjuv-dev.apk
ConfJuvApp/builds/confjuvapp-live.apk
ConfJuvApp/builds/confjuvapp-web.zip
ConfJuvApp/config.xml
ConfJuvApp/www/js/controllers.js
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.ionicframework.confjuvapp748431" version="0.0.25" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.ionicframework.confjuvapp748431" version="0.0.26" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>#3ConfJuv</name>
   <description>Aplicativo móvel para 3ª Conferência Nacional de Juventude</description>
   <author email="confjuvapp@gmail.com" href="http://www.juventude.gov.br/"></author>
@@ -21,12 +21,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     // Function to open the modal
     $scope.openModal = function() {
       if (ConfJuvAppUtils.getPrivateToken()) {
-        $scope.token = ConfJuvAppUtils.getPrivateToken();
-        $scope.loggedIn = true;
         $scope.loadMe();
-        $scope.loadTopics($scope.token);
-        $scope.loadStages();
-        $scope.parseURLParams();
       } else if ($scope.modal) {
         $scope.modal.show();
       } else {
@@ -83,7 +78,6 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       $scope.openModal();
     };
-
     // Function to close the modal
     $scope.closeModal = function() {
       $scope.modal.hide();
@@ -109,19 +103,13 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
         timeout: 10000
       }
-
       $http.post(ConfJuvAppUtils.pathTo('login'), jQuery.param(data), config)
       .then(function(resp) {
         $scope.closeModal();
         var popup = $ionicPopup.alert({ title: 'Login', template: 'Login efetuado com sucesso!' });
-        $scope.loggedIn = true;
         $scope.user = resp.data.person;
         popup.then(function() {
-          $scope.token = resp.data.private_token;
-          ConfJuvAppUtils.setPrivateToken($scope.token);
-          $scope.loadTopics(resp.data.private_token);
-          $scope.loadStages();
-          $scope.parseURLParams();
+          $scope.loginCallback(resp.data.private_token);
         });
       }, function(err) {
         $scope.closeModal();
@@ -134,6 +122,15 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       });
     };
+    $scope.loginCallback = function(token) {
+      $scope.loggedIn = true;
+      $scope.token = token;
+      ConfJuvAppUtils.setPrivateToken(token);
+      $scope.loadTopics(token);
+      $scope.loadStages();
+      $scope.parseURLParams();
+    };
+
     // Function to retrieve password
     $scope.forgotPassword = function(email) {
@@ -261,15 +258,17 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
     $scope.loadMe = function() {
       $scope.loading = true;
-      var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken();
-      var path = 'people/me/' +params;
+      var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken(),
+          path = 'people/me/' + params;
       $http.get(ConfJuvAppUtils.pathTo(path))
       .then(function(resp) {
         $scope.user = resp.data.person;
+        $scope.loginCallback(ConfJuvAppUtils.getPrivateToken());
         $scope.loading = false;
       }, function(err) {
         $scope.token = ConfJuvAppUtils.setPrivateToken(null);
+        $scope.loggedIn = false;
         var popup = $ionicPopup.alert({ title: 'Usuário', template: 'Sessão expirada. Por favor faça login novamente.' });
         popup.then(function() {
           $scope.openModal();
@@ -278,8 +277,6 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
       });
     };
-
-
     $scope.backToLoginHome = function() {
       $scope.registerFormDisplayed = false;
       $scope.loginFormDisplayed = false;
1	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>	1	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2	-<widget id="com.ionicframework.confjuvapp748431" version="0.0.25" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">	2	+<widget id="com.ionicframework.confjuvapp748431" version="0.0.26" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
3	<name>#3ConfJuv</name>	3	<name>#3ConfJuv</name>
4	<description>Aplicativo móvel para 3ª Conferência Nacional de Juventude</description>	4	<description>Aplicativo móvel para 3ª Conferência Nacional de Juventude</description>
5	<author email="confjuvapp@gmail.com" href="http://www.juventude.gov.br/"></author>	5	<author email="confjuvapp@gmail.com" href="http://www.juventude.gov.br/"></author>