From c797ecb5d54370216ce00075ac77a862c6ec850e Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Tue, 24 Nov 2015 14:19:33 -0200
Subject: [PATCH] Add: active page ('/ativar/:token') - issue #44

---
 src/app/components/auth/auth.service.js |  3 +--
 src/app/index.route.js                  | 11 +++++++++++
 src/app/pages/auth/active.controller.js | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/app/pages/auth/active.html          | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/app/pages/auth/change.html          |  2 +-
 5 files changed, 117 insertions(+), 3 deletions(-)
 create mode 100644 src/app/pages/auth/active.controller.js
 create mode 100644 src/app/pages/auth/active.html

diff --git a/src/app/components/auth/auth.service.js b/src/app/components/auth/auth.service.js
index 59d8a97..8778d99 100644
--- a/src/app/components/auth/auth.service.js
+++ b/src/app/components/auth/auth.service.js
@@ -66,8 +66,7 @@
 
     function activate (code) {
       var url = PATH.host + '/api/v1/activate';
-      var encodedData = 'private_token=' + API.token;
-      encodedData += '&activation_code=' + code;
+      var encodedData = 'activation_code=' + code;
 
       return $http
         .patch(url, encodedData)
diff --git a/src/app/index.route.js b/src/app/index.route.js
index 4e1a877..3ec21b6 100644
--- a/src/app/index.route.js
+++ b/src/app/index.route.js
@@ -42,6 +42,17 @@
           }
         }
       })
+      .state('ativar', {
+        url: '/ativar/:activation_code',
+        ncyBreadcrumb: {label: 'Ativar e-mail'},
+        views: {
+          'main': {
+            templateUrl: 'app/pages/auth/active.html',
+            controller: 'ActivePageController',
+            controllerAs: 'pageActive'
+          }
+        }
+      })
       .state('recuperar', {
         url: '/recuperar',
         ncyBreadcrumb: {label: 'Recuperar senha'},
diff --git a/src/app/pages/auth/active.controller.js b/src/app/pages/auth/active.controller.js
new file mode 100644
index 0000000..f20440c
--- /dev/null
+++ b/src/app/pages/auth/active.controller.js
@@ -0,0 +1,56 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('dialoga')
+    .controller('ActivePageController', ActivePageController);
+
+  /** @ngInject */
+  function ActivePageController(AuthService, $state, $log) {
+    var vm = this;
+
+    vm.AuthService = AuthService;
+    vm.$state = $state;
+    vm.$log = $log;
+
+    vm.init();
+    vm.doActivation();
+
+    vm.$log.debug('ActivePageController');
+  }
+
+  ActivePageController.prototype.init = function() {
+    var vm = this;
+
+    // init variables
+    vm.loading = true;
+    vm.activation_code = vm.$state.params.activation_code;
+  };
+
+  ActivePageController.prototype.doActivation = function() {
+    var vm = this;
+
+    vm.AuthService.activate(vm.activation_code).
+    then(function(response){
+      // SUCCESS
+      vm.$log.info('response', response);
+
+      vm.successMessageTitle = 'Pronto!';
+      vm.successMessageContent = 'Conta ativada com sucesso!';
+    }, function(response){
+      // ERROR
+      vm.$log.error('response', response);
+
+      vm.errorMessageTitle = 'Erro!';
+      
+      // Server Error
+      if(response.status >= 500 || response.status < 600){
+        vm.errorMessageContent = 'Código de ativação incorreto.';
+      }
+    })
+    .finally(function(data){
+      vm.$log.debug('finally', data);
+      vm.loading = false;
+    });
+  };
+})();
diff --git a/src/app/pages/auth/active.html b/src/app/pages/auth/active.html
new file mode 100644
index 0000000..2e5dbd8
--- /dev/null
+++ b/src/app/pages/auth/active.html
@@ -0,0 +1,48 @@
+<div class="container">
+  <div class="row">
+    <div class="col-sm-12">
+      <h2>Ativar conta</h2>
+    </div>
+  </div>
+</div>
+<section role="main" class="section-gray">
+  <div class="container">
+    <div class="row">
+      <br>
+      <div class="col-sm-8 col-sm-offset-2">
+        
+        <div ng-if="pageActive.loading">
+          <h3>Aguarde...</h3>
+          <p>Estamos ativando a sua conta ({{::pageActive.activation_code}}).</p>
+        </div>
+
+        <div ng-if="pageActive.successMessageTitle">
+          <show-message
+          type="'success'"
+          message="pageActive.successMessageTitle"
+          description="pageActive.successMessageContent"
+          ></show-message>
+          <div class="row">
+            <div class="col-sm-8 col-sm-offset-4">
+              <p><a ui-sref="entrar" class="btn btn-default">Entrar</a></p>
+            </div>
+          </div>
+        </div>
+
+        <div ng-if="pageActive.errorMessageTitle">
+          <show-message
+          type="'error'"
+          message="pageActive.errorMessageTitle"
+          description="pageActive.errorMessageContent"
+          ></show-message>
+          <div class="row">
+            <div class="col-sm-8 col-sm-offset-4">
+              <p><a ui-sref="reenviar-email" class="btn btn-default">Re-enviar e-mail de confirmação</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <br>
+    </div>
+  </div>
+</section>
diff --git a/src/app/pages/auth/change.html b/src/app/pages/auth/change.html
index ed7e1ac..3b64d71 100644
--- a/src/app/pages/auth/change.html
+++ b/src/app/pages/auth/change.html
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-sm-12">
       <h2>Esqueci minha senha</h2>
-      <h5>Agra é só criar e confirmar sua nova senha.</h5>
+      <h5>Agora é só criar e confirmar sua nova senha.</h5>
     </div>
   </div>
 </div>
--
libgit2 0.21.2