Change proposal vote -> by captcha now

Leonardo Merlin
1 parent a9de7b59
Showing 7 changed files with 127 additions and 98 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/components/auth/auth.service.js
src/app/components/proposal-box/proposal-box.directive.js
src/app/components/proposal-box/proposal-box.html
src/app/index.run.js
src/app/pages/programas/programa.controller.js
src/app/pages/programas/programa.html
@@ -162,20 +162,15 @@
       }
     }
-    function voteProposal (proposal_id, params, cbSuccess, cbError){
+    function voteProposal (proposal_id, params){
       var url = service.apiArticles + proposal_id + '/vote';
       var paramsExtended = angular.extend({
-        private_token: $rootScope.currentUser.private_token
-        // private_token: 'e2198fdbcc20409f082829b4b5c0848e'
+        private_token: $rootScope.temporaryToken.private_token
       }, params);
       var encodedParams = angular.element.param(paramsExtended);
-      UtilService.post(url, encodedParams).then(function(response){
-        cbSuccess(response);
-      }).catch(function(error){
-        cbError(error);
-      });
+      return UtilService.post(url, encodedParams);
     }
     function getEvents (community_id, params) {
@@ -136,6 +136,8 @@
         }, function(response) {
           $log.debug('AuthService.login [FAIL] response', response);
           $rootScope.$broadcast(AUTH_EVENTS.loginFailed);
+
+          return $q.reject(response);
         });
     }
@@ -143,7 +145,17 @@
       var url = PATH.host + '/api/v1/login-captcha';
       var encodedData = angular.element.param(data);
-      return $http.post(url, encodedData);
+      return $http.post(url, encodedData).then(function(response){
+        // SUCCESS
+        $log.debug('AuthService.loginCaptcha [SUCCESS] response', response);
+
+        var temporaryToken = response.data.private_token;
+        Session.setTemporaryToken(temporaryToken);
+        $rootScope.temporaryToken = temporaryToken;
+        return temporaryToken;
+      }, function(response){
+        return $q.reject(response.data);
+      });
     }
     function logout () {
@@ -206,7 +218,7 @@
     service.create = function(data) {
-      $localStorage.currentUser = data;
+      $localStorage.currentUser = data.user;
       $log.debug('User session created.', $localStorage.currentUser);
       return $localStorage.currentUser;
@@ -223,6 +235,15 @@
       return $localStorage.currentUser;
     };
+    service.setTemporaryToken = function (data) {
+      $localStorage.temporaryToken = data.private_token;
+      $log.debug('temporaryToken created:', $localStorage.temporaryToken);
+    };
+
+    service.getTemporaryToken = function () {
+      return $localStorage.temporaryToken;
+    };
+
     return service;
   }
@@ -9,7 +9,7 @@
   function proposalBox() {
     /** @ngInject */
-    function ProposalBoxController($scope, $rootScope, $state, $timeout, $interval, $window, VOTE_STATUS, VOTE_OPTIONS, AuthService, $log) {
+    function ProposalBoxController($scope, $rootScope, $state, $timeout, $interval, $window, VOTE_STATUS, VOTE_OPTIONS, AuthService, DialogaService, $log) {
       $log.debug('ProposalBoxController');
       var vm = this;
@@ -28,7 +28,7 @@
       vm.addListeners();
     }
-    ProposalBoxController.prototype.init = function () {
+    ProposalBoxController.prototype.init = function() {
       var vm = this;
@@ -44,52 +44,54 @@
       vm.voteProposalRedirectURI = 'state=programa&task=vote-proposal&slug=' + slug + '&proposal_id=' + proposal_id;
     };
-    ProposalBoxController.prototype.addListeners = function () {
+    ProposalBoxController.prototype.addListeners = function() {
       var vm = this;
-      vm.$scope.$on('proposal-box:proposal-loaded', function(event, data){
-        if(data.success){
+      vm.$scope.$on('proposal-box:proposal-loaded', function(event, data) {
+        if (data.success) {
           vm.STATE = null;
         }
-        if(data.error){
+        if (data.error) {
           vm.errorOnSkip = data.error;
         }
       });
-      vm.$scope.$on('proposal-box:vote-response', function(event, data){
+      vm.$scope.$on('proposal-box:vote-response', function(event, data) {
         vm.$log.debug('proposal-box:vote-response');
         vm.$log.debug('event', event);
         vm.$log.debug('data', data);
-        if(data.success) {
+        if (data.success) {
           vm.STATE = vm.VOTE_STATUS.SUCCESS;
         }
-        if(data.error) {
+        if (data.error) {
           vm.STATE = vm.VOTE_STATUS.ERROR;
         }
-        vm.message = data.message;
+        if (data.code === 401) {
+          vm.message = 'Não autorizado.';
+        }
       });
       // Load captcha
       var stop = null;
-      stop = vm.$interval(function(){
+      stop = vm.$interval(function() {
         var $el = angular.element('#serpro_captcha');
-        if ($el && $el.length > 0 ){
+        if ($el && $el.length > 0) {
           vm.$window.initCaptcha($el[0]);
           vm.$interval.cancel(stop);
           stop = undefined;
-        }else{
+        }else {
           vm.$log.debug('captcha element not found.');
         }
       }, 10);
     };
-    ProposalBoxController.prototype.showContent = function (slug) {
+    ProposalBoxController.prototype.showContent = function(slug) {
       var vm = this;
       vm.$state.go('programa', {
@@ -100,11 +102,13 @@
       });
     };
-    ProposalBoxController.prototype.canVote = function () {
-      return false;
+    ProposalBoxController.prototype.canVote = function() {
+      var vm = this;
+
+      return !!vm.$rootScope.temporaryToken;
     };
-    ProposalBoxController.prototype.submitCaptcha = function ($event, captchaForm) {
+    ProposalBoxController.prototype.submitCaptcha = function($event, captchaForm) {
       var vm = this;
       var target = $event.target;
@@ -119,52 +123,73 @@
         // SUCCESS
         vm.$log.debug('register success.data', data);
-        // get captcha_token
+        // SEND VOTE
+        if (vm._oldVoteValue) {
+          // hide captcha form
+          vm.showCaptchaForm = false;
+          vm.vote(vm._oldVoteValue);
+        }
+
       }, function(data) {
         // ERROR
         vm.$log.debug('register error.data', data);
-        vm.sendingCaptchaError = {code: data.status };
+        vm.sendingCaptchaError = {
+          code: data.status,
+          message: data.message || ('Erro (' + data.status + '). Já estamos trabalhando para resolver o problema.<br/>Por favor, tente novamente mais tarde')
+        };
-        if(data.status === 404){
-          vm.$log.error('The api service is out!?');
+        if (angular.equals(vm.sendingCaptchaError.message, 'Internal captcha validation error')) {
+          vm.sendingCaptchaError.message = 'Erro interno ao tentar validar captcha.<br/><br/>Já estamos trabalhando para resolver o problema.<br/>Por favor, tente novamente mais tarde.';
         }
-      }, function(data){
+      }, function(data) {
         // UPDATE
         vm.$log.debug('register update.data', data);
-      }).finally(function(){
+      }).finally(function() {
         vm.sendingCaptcha = false;
       });
     };
-    ProposalBoxController.prototype.vote = function (value) {
+    ProposalBoxController.prototype.captchaTryAgain = function() {
       var vm = this;
-      if(vm.canVote()){
-        vm.$scope.$emit('proposal-box:vote', {
-          OPTION: value,
-          proposal_id: vm.proposal.id
-        });
-        vm.$log.debug('Sending vote', value);
-      }else{
-        vm.$log.debug('You cannot vote.');
-        vm.showCaptchaForm = true;
-      }
+      vm.showCaptchaForm = true;
+      vm.sendingCaptcha = false;
+      vm.sendingCaptchaError = false;
+      vm.message = null;
+
+      // reload new captcha
+      var $el = angular.element('#serpro_captcha');
+      vm.$window.reloadCaptcha($el[0]);
+
+      // focus on input
+      angular.element('#captcha_text').val('').focus();
     };
-    ProposalBoxController.prototype.voteDown = function () {
+    ProposalBoxController.prototype.vote = function(value) {
       var vm = this;
-      vm.STATE = vm.VOTE_STATUS.LOADING;
-      vm.$scope.$emit('proposal-box:vote', {
-        OPTION: vm.VOTE_OPTIONS.DOWN,
-        proposal_id: vm.proposal.id
-      });
-      vm.$log.debug('Sending vote');
+      if (vm.canVote()) {
+        if (vm.doVote) {
+          var data = {
+            proposal_id: vm.proposal.id,
+            value: value
+          };
+          vm.doVote(data);
+        }else {
+          vm.$log.error('No vote function to handler votes');
+        }
+      }else {
+        vm.$log.debug('You cannot vote.');
+        vm._oldVoteValue = value;
+        vm.showCaptchaForm = true;
+
+        angular.element('#captcha_text').focus();
+      }
     };
-    ProposalBoxController.prototype.skip = function () {
+    ProposalBoxController.prototype.skip = function() {
       var vm = this;
       vm.errorOnSkip = false;
@@ -176,7 +201,7 @@
       vm.$log.debug('Sending vote');
     };
-    ProposalBoxController.prototype.getSocialUrl = function () {
+    ProposalBoxController.prototype.getSocialUrl = function() {
       var vm = this;
       return vm.$state.href('programa', {
@@ -193,7 +218,8 @@
         topic: '=',
         category: '=',
         showVote: '=',
-        focus: '@'
+        focus: '@',
+        doVote: '&'
         // @ -> Text binding / one-way binding
         // = -> Direct model binding / two-way binding
         // & -> Behaviour binding / Method binding
@@ -72,23 +72,23 @@
           <div class="col-sm-12 col-height col-middle">
             <div class="inside inside-full-height">
               <div class="content text-center">
-                <div ng-if="vm.sendingCaptcha">
+                <div ng-show="vm.sendingCaptcha">
                   <p>Enviando captcha...</p>
                 </div>
-                <div ng-if="!vm.sendingCaptcha">
-
-                  <div class="row" class="feedback-message" ng-if="vm.sendingCaptchaError">
+                <div ng-hide="vm.sendingCaptcha">
+                  <div class="row feedback-message" ng-show="vm.sendingCaptchaError">
                     <div class="col-sm-12">
                       <div class="feedback--title alert alert-danger">Erro!</div>
-                      <div class="feedback--message" ng-if="vm.sendingCaptchaError.code === 404">
-                        <p>
-                          Houve uma falha. Já estamos trabalhando para resolver o problema.
-                          <br/> Por favor, tente novamente mais tarde
-                        </p>
+                      <div class="feedback--message" ng-if="!vm.message">
+                        <p ng-bind-html="vm.sendingCaptchaError.message"></p>
+                      </div>
+                      <div>
+                        <button type="reset" class="btn btn-link" ng-click="vm.captchaTryAgain()">Tentar novamente</button>
+                        <button type="reset" class="btn btn-link" ng-click="vm.showCaptchaForm = false">Voltar</button>
                       </div>
                     </div>
                   </div>
-                  <div ng-if="!vm.sendingCaptchaError">
+                  <div ng-hide="vm.sendingCaptchaError">
                     <form name="captchaForm" ng-submit="vm.submitCaptcha($event, captchaForm)">
                       <div class="form-group">
                         <div id="serpro_captcha" class="captcha"></div>
@@ -102,7 +102,7 @@
                         <button  type="submit" class="btn btn-lg btn-block btn-submit">Enviar</button>
                       </div>
                       <div class="form-group">
-                        <button class="btn btn-link" ng-click="vm.showCaptchaForm = false">Voltar</button>
+                        <button type="reset" class="btn btn-link" ng-click="vm.showCaptchaForm = false">Voltar</button>
                       </div>
                     </form>
                   </div>
@@ -41,6 +41,7 @@
     });
     $rootScope.currentUser = $localStorage.currentUser;
+    $rootScope.temporaryToken = $localStorage.temporaryToken;
     $log.debug('[RUN] Auth end.');
   }
@@ -142,24 +142,6 @@
         vm.proposalStatus = vm.PROPOSAL_STATUS.ERROR;
       });
     });
-
-    vm.$scope.$on('proposal-box:vote', function(event, params) {
-      // vm.$log.debug('event', event);
-      // vm.$log.debug('params', params);
-      var proposal_id = params.proposal_id;
-      var OPTION = params.OPTION;
-
-      switch (OPTION){
-        case vm.VOTE_OPTIONS.UP:
-        case vm.VOTE_OPTIONS.DOWN:
-        case vm.VOTE_OPTIONS.SKIP:
-          vm.vote(proposal_id, OPTION);
-        break;
-        default:
-          vm.$log.error('Vote option not handled:', OPTION);
-        break;
-      }
-    });
   };
   ProgramaPageController.prototype.loadProposalById = function(proposal_id) {
@@ -219,31 +201,28 @@
       return;
     }
-    if (!vm.$rootScope.currentUser) {
-      // vm.$state.go('entrar', {
-      //   redirect_uri: vm.sendProposalRedirectURI,
-      //   message: 'Você precisa estar logado para votar em uma proposta.'
-      // }, {
-      //   location: true
-      // });
+    if (!vm.$rootScope.temporaryToken) {
+      vm.$log.debug('"temporaryToken" not defined. Abort.');
       return;
     }
     vm.DialogaService.voteProposal(proposal_id, {
       value: value
-    }, function(response) {
-      vm.$log.debug('response', response);
+    }).then(function(response) {
+      vm.$log.debug('voteProposal response', response);
       response.success = true;
       vm.$scope.$broadcast('proposal-box:vote-response', response);
-    }, function(error) {
-      vm.$log.error('error', error);
+    }, function(response) {
+      vm.$log.debug('voteProposal error', response);
+
+      response.error = true;
+      vm.$scope.$broadcast('proposal-box:vote-response', response);
+    }).finally(function(response){
+      vm.$log.debug('voteProposal finally', response);
-      error.error = true;
-      vm.$scope.$broadcast('proposal-box:vote-response', error);
     });
   };
-  ProgramaPageController.prototype.voteHasBeenComputed = function() {};
   ProgramaPageController.prototype.showProposalsList = function() {
     var vm = this;
@@ -90,7 +90,14 @@
                 <div>
                   <div class="col-xs-12" ng-if="!pagePrograma.loadingProposalBox && pagePrograma.randomProposal" ng-class="{'focused-proposal': !!pagePrograma.search.proposal_id}">
                     <h3 class="color-theme-fg">Apoie outras propostas</h3>
-                    <proposal-box proposal="pagePrograma.randomProposal" topic="pagePrograma.article" category="pagePrograma.category" show-vote="true" focus="{{pagePrograma.search.proposal_id}}" ></proposal-box>
+                    <proposal-box
+                    proposal="pagePrograma.randomProposal"
+                    topic="pagePrograma.article"
+                    category="pagePrograma.category"
+                    show-vote="true"
+                    focus="{{pagePrograma.search.proposal_id}}"
+                    do-vote="pagePrograma.vote(proposal_id, value)"
+                    ></proposal-box>
                   </div>
                   <!-- Loading Proposal Box -->
	@@ -41,6 +41,7 @@		@@ -41,6 +41,7 @@
41	});	41	});
42		42
43	$rootScope.currentUser = $localStorage.currentUser;	43	$rootScope.currentUser = $localStorage.currentUser;
		44	+ $rootScope.temporaryToken = $localStorage.temporaryToken;
44		45
45	$log.debug('[RUN] Auth end.');	46	$log.debug('[RUN] Auth end.');
46	}	47	}
	@@ -90,7 +90,14 @@		@@ -90,7 +90,14 @@
90	<div>	90	<div>
91	<div class="col-xs-12" ng-if="!pagePrograma.loadingProposalBox && pagePrograma.randomProposal" ng-class="{'focused-proposal': !!pagePrograma.search.proposal_id}">	91	<div class="col-xs-12" ng-if="!pagePrograma.loadingProposalBox && pagePrograma.randomProposal" ng-class="{'focused-proposal': !!pagePrograma.search.proposal_id}">
92	<h3 class="color-theme-fg">Apoie outras propostas</h3>	92	<h3 class="color-theme-fg">Apoie outras propostas</h3>
93	- <proposal-box proposal="pagePrograma.randomProposal" topic="pagePrograma.article" category="pagePrograma.category" show-vote="true" focus="{{pagePrograma.search.proposal_id}}" ></proposal-box>	93	+ <proposal-box
		94	+ proposal="pagePrograma.randomProposal"
		95	+ topic="pagePrograma.article"
		96	+ category="pagePrograma.category"
		97	+ show-vote="true"
		98	+ focus="{{pagePrograma.search.proposal_id}}"
		99	+ do-vote="pagePrograma.vote(proposal_id, value)"
		100	+ ></proposal-box>
94	</div>	101	</div>
95		102
96	<!-- Loading Proposal Box -->	103	<!-- Loading Proposal Box -->