Add initial internal redirect handler

Leonardo Merlin
1 parent 43b414b9
Showing 8 changed files with 91 additions and 20 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/components/auth-user/auth-user.directive.js
src/app/components/auth/auth.service.js
src/app/components/event-list/event-list.directive.js
src/app/components/event-list/event-list.html
src/app/index.route.js
src/app/pages/article/article.html
src/app/pages/auth/auth.controller.js
@@ -156,19 +156,36 @@
       });
     }
-    function subscribeToEvent (event_id, params, cbSuccess, cbError) {
-      var url = service.apiArticles + event_id + '/follow';
+    function getSubscribers (event_id, params, cbSuccess, cbError) {
+      var url = service.apiArticles + event_id + '/followers?_=' + new Date().getTime();
       var paramsExtended = angular.extend({
-        private_token: API.token
+        // 'fields[]': ['id', 'slug', 'title', 'abstract', 'body', 'categories', 'created_at', 'start_date', 'end_date', 'hits'],
+        'content_type':'Event'
       }, params);
-      UtilService.post(url, {params: paramsExtended}).then(function(data){
+      UtilService.get(url, {params: paramsExtended}).then(function(data){
         cbSuccess(data.articles);
       }).catch(function(error){
         cbError(error);
       });
     }
+    function subscribeToEvent (event_id, params, cbSuccess, cbError) {
+
+      if(!$rootScope.currentUser){
+        cbError({message: 'Usuário não logado.'});
+      }
+
+      var url = service.apiArticles + event_id + '/follow';
+      var encodedParams = 'private_token=' + $rootScope.currentUser.private_token;
+
+      UtilService.post(url, encodedParams).then(function(response){
+        cbSuccess(response);
+      }).catch(function(error){
+        cbError(error);
+      });
+    }
+
     function searchTopics (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Topic&query=cisternas
       var url = '/api/v1/search/article';
@@ -42,7 +42,6 @@
     AuthUserController.prototype.onClickLogout = function (){
       var vm = this;
-      // TODO: emit event?
       vm.AuthService.logout();
     };
@@ -130,6 +130,7 @@
           $log.debug('AuthService.login [SUCCESS] response', response);
           var currentUser = Session.create(response.data);
+          $rootScope.currentUser = currentUser;
           $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
           return currentUser;
@@ -142,7 +143,7 @@
     function logout () {
       Session.destroy();
-
+      $rootScope.currentUser = null;
       $rootScope.$broadcast(AUTH_EVENTS.logoutSuccess);
     }
@@ -8,11 +8,12 @@
   /** @ngInject */
   function eventList() {
     /** @ngInject */
-    function EventListController($scope, $rootScope, $state, $log) {
+    function EventListController(ArticleService, $scope, $rootScope, $state, $log) {
       $log.debug('EventListController');
       var vm = this;
+      vm.ArticleService = ArticleService;
       vm.$scope = $scope;
       vm.$rootScope = $rootScope;
       vm.$state = $state;
@@ -39,10 +40,26 @@
       vm.isCollapsed = !vm.isCollapsed;
     };
-    EventListController.prototype.subscribe = function (data) {
+    EventListController.prototype.subscribe = function (event_id) {
       var vm = this;
-      vm.$log.debug('data', data);
+      vm.$log.debug('event_id', event_id);
+
+      if(!vm.$rootScope.currentUser){
+        vm.$log.warn('User is not logged in. Redirect to Auth page.');
+        vm.$state.go('entrar',{
+          redirect_uri: 'state=inicio&task=subscribe&event_id=' + event_id
+        },{
+          location: true
+        });
+      }else{
+        vm.ArticleService.subscribeToEvent(event_id, {}, function(response){
+          vm.$log.debug('response', response);
+        }, function(error){
+          vm.$log.debug('error', error);
+        })
+      }
+
     };
     var directive = {
@@ -59,12 +59,14 @@
                     <span class="theme">{{::event.categories[0].name}}</span>
                   </td>
                   <td align="right">
-                    <b>(?)</b>
-                    <br/>
-                    <span>Inscritos</span>
+                    <div ng-if="!event.subscribers_count">
+                      <b>(?)</b>
+                      <br/>
+                      <span>Inscritos</span>
+                    </div>
                   </td>
                   <td align="left">
-                    <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe('EVENT_ID')">
+                    <button type="button" class="btn color-theme-common-bg" ng-click="vm.subscribe(event.id)">
                       Inscreva-se
                       <span class="sr-only">no bate-papo com (ministro) no dia {event.start_date | date : "dd/MM/yyyy"}} as {{event.start_date | date : "HH:mm"}} horas</span>
                     </button>
@@ -23,7 +23,7 @@
         }
       })
       .state('entrar', {
-        url: '/entrar',
+        url: '/entrar?redirect_uri',
         ncyBreadcrumb: {label: 'Entrar'},
         views: {
           'header': { templateUrl: 'app/pages/header/header.html' },
@@ -26,9 +26,15 @@
 	<article>
 		<header class="container">
       <div class="row">
-        <h1>{{::pageArticle.article.title}}</h1>
+        <div class="col-sm-12">
+          <h1>{{::pageArticle.article.title}}</h1>
+        </div>
       </div>
 		</header>
-		<div ng-bind-html="pageArticle.article.body"></div>
+    <article>
+      <div class="container">
+		    <div ng-bind-html="pageArticle.article.body"></div>
+      </div>
+    </article>
 	</article>
 </div>
@@ -6,13 +6,13 @@
     .controller('AuthPageController', AuthPageController);
   /** @ngInject */
-  function AuthPageController($scope, $rootScope, AUTH_EVENTS, AuthService, DialogaService, Session, $log) {
-    $log.debug('AuthPageController');
-
+  function AuthPageController($scope, $rootScope, $location, $state, AUTH_EVENTS, AuthService, DialogaService, Session, $log) {
     var vm = this;
-    vm.$rootScope = $rootScope;
     vm.$scope = $scope;
+    vm.$rootScope = $rootScope;
+    vm.$location = $location;
+    vm.$state = $state;
     vm.AUTH_EVENTS = AUTH_EVENTS;
     vm.AuthService = AuthService;
     vm.DialogaService = DialogaService;
@@ -21,6 +21,8 @@
     vm.init();
     vm.loadData();
+
+    vm.$log.debug('AuthPageController');
   }
   AuthPageController.prototype.init = function() {
@@ -32,6 +34,12 @@
     vm.terms = null;
     vm.loadingTerms = null;
+    vm.search = vm.$location.search();
+    var redirect = vm.search.redirect_uri || '';
+    if(redirect && redirect.length > 0){
+      vm.params = JSON.parse('{"' + decodeURI(redirect).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}');
+    }
+
     // attach events
     vm.currentUser = vm.Session.getCurrentUser();
@@ -78,6 +86,8 @@
       // 'Cadastro efetuado com sucesso.'
       // 'Verifique seu email para confirmar o cadastro.'
+      // TODO: show messagens and redirect timeout
+      vm.redirectBack();
     }, function(response){
       vm.$log.debug('register error.response', response);
@@ -92,9 +102,28 @@
     vm.AuthService.login(credentials).then(function(user) {
       // handle view
       vm.$log.debug('user', user);
+      vm.redirectBack();
     }, function() {
       // handle view
     });
   };
+  AuthPageController.prototype.redirectBack = function(){
+    var vm = this;
+
+    if(!vm.params){
+      vm.$log.warn('No redirect params defined.');
+      return;
+    }
+    var state = vm.params.state;
+    switch(state){
+      case 'inicio':
+        vm.$state.go(state, {
+          event_id: vm.params.event_id,
+          task: vm.params.task
+        });
+        break;
+    }
+  }
+
 })();
	@@ -42,7 +42,6 @@		@@ -42,7 +42,6 @@
42	AuthUserController.prototype.onClickLogout = function (){	42	AuthUserController.prototype.onClickLogout = function (){
43	var vm = this;	43	var vm = this;
44		44
45	- // TODO: emit event?
46	vm.AuthService.logout();	45	vm.AuthService.logout();
47	};	46	};
48		47
	@@ -23,7 +23,7 @@		@@ -23,7 +23,7 @@
23	}	23	}
24	})	24	})
25	.state('entrar', {	25	.state('entrar', {
26	- url: '/entrar',	26	+ url: '/entrar?redirect_uri',
27	ncyBreadcrumb: {label: 'Entrar'},	27	ncyBreadcrumb: {label: 'Entrar'},
28	views: {	28	views: {
29	'header': { templateUrl: 'app/pages/header/header.html' },	29	'header': { templateUrl: 'app/pages/header/header.html' },