Fixes #7

Leonardo Merlin
1 parent af3db65c
Showing 3 changed files with 46 additions and 21 deletions Show diff stats
src/app/components/auth/auth.service.js
src/app/pages/auth/auth.controller.js
src/app/pages/auth/signin.html
@@ -37,12 +37,22 @@
         .then(function(response) {
           $log.debug('AuthService.register [SUCCESS] response', response);
-          var currentUser = Session.create(response.data);
+          var data = response.data;
-          $rootScope.currentUser = currentUser;
-          $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
-          $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
+          if ( data.user && data.user.activated === false){
+            // usuário criado E não verificado o e-mail
+            
+          }
+
+          if ( data.user && data.user.activated === true){
+            // usuário criado E não verificado o e-mail
+            var currentUser = Session.create(data);
+            $rootScope.currentUser = currentUser;
+            $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
+          }
+          
+          $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
           return response;
         }, function(response) {
           $log.debug('AuthService.register [FAIL] response', response);
@@ -61,6 +61,7 @@
     // handle logout
     vm.$scope.$on(vm.AUTH_EVENTS.logoutSuccess, function() {
       vm.currentUser = vm.Session.getCurrentUser();
+      vm._attachCaptcha();
     });
   };
@@ -83,16 +84,15 @@
     var vm = this;
     vm.$scope.$on(vm.AUTH_EVENTS.registerSuccess, function(event, response) {
-      vm.$log.debug('TODO: handle register success');
       vm.$log.debug('[register success] response', response);
     });
     vm.$scope.$on(vm.AUTH_EVENTS.registerFailed, function(event, response) {
-      vm.$log.debug('TODO: handle register error');
       vm.$log.debug('[register error] response', response);
-      var reason = response.data.message;
-      vm.errorMessage = reason;
+      // REMOVED: feedback alread on "reject handler"
+      // var reason = response.data.message;
+      // vm.errorMessage = reason;
     });
     vm.$scope.$on('oauthClientPluginResult', function(event, response) {
@@ -103,6 +103,12 @@
       // var user = response.data.user;
     });
+    vm._attachCaptcha();
+  };
+
+  AuthPageController.prototype._attachCaptcha = function() {
+    var vm = this;
+
     var stop = null;
     stop = vm.$interval(function(){
       var $el = angular.element('#serpro_captcha');
@@ -137,17 +143,26 @@
       // TODO: mensagens de sucesso
       // 'Cadastro efetuado com sucesso.'
       // 'Verifique seu email para confirmar o cadastro.'
-      vm.messageTitle = 'Cadastro efetuado com sucesso!';
-      vm.successMessage = 'Verifique seu e-mail para confirmar o cadastro.';
+      vm.signupMessageTitle = 'Cadastro efetuado com sucesso!';
+      vm.signupSuccessMessage = 'Verifique seu e-mail para confirmar o cadastro.';
       vm.redirectBack();
     }, function(response) {
       vm.$log.debug('register error.response', response);
-      var message = response.data.message;
-      vm.errorMessage = message;
-
-      if(response.data.code === 500){
-        vm.internalError = true;
+      vm.internalError = true;
+
+      switch (response.data.code) {
+        case 400: // bad request
+          var errors = JSON.parse(response.data.message);
+          if(errors && errors.email){
+            vm.signupErrorMessage = "E-mail já está em uso."
+          }
+        break;
+        case 500:
+          vm.signupErrorMessage = message;
+        break;
+        default:
+        break;
       }
@@ -8,14 +8,14 @@
 <section role="main" class="section-gray auth-content">
   <div class="container">
     <div class="row">
-      <div ng-if="pageSignin.currentUser">
+      <div ng-if="pageSignin.currentUser || pageSignin.signupMessageTitle">
         <div class="row">
           <div class="col-sm-8 col-sm-offset-2">
             <div class="feedback-message">
               <show-message
               type="'success'"
-              message="pageSignin.messageTitle || 'Você está logado!'"
-              description="pageSignin.successMessage"
+              message="pageSignin.signupMessageTitle || 'Você está logado!'"
+              description="pageSignin.signupSuccessMessage"
               ></show-message>
               <div class="row">
@@ -35,7 +35,7 @@
           </div>
         </div>
       </div>
-      <div ng-if="!pageSignin.currentUser">
+      <div ng-if="!pageSignin.currentUser && !pageSignin.signupMessageTitle">
         <div class="col-sm-5">
           <div class="row">
             <div class="col-md-12">
@@ -96,10 +96,10 @@
               </p>
             </div>
           </div>
-          <div class="row" ng-if="pageSignin.errorMessage">
+          <div class="row" ng-if="pageSignin.signupErrorMessage">
             <div class="col-sm-12">
               <div class="alert alert-danger">
-                {{pageSignin.errorMessage}}
+                {{pageSignin.signupErrorMessage}}
               </div>
               <div ng-if="vm.internalError">
                 <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
	@@ -37,12 +37,22 @@		@@ -37,12 +37,22 @@
37	.then(function(response) {	37	.then(function(response) {
38	$log.debug('AuthService.register [SUCCESS] response', response);	38	$log.debug('AuthService.register [SUCCESS] response', response);
39		39
40	- var currentUser = Session.create(response.data);	40	+ var data = response.data;
41		41
42	- $rootScope.currentUser = currentUser;
43	- $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
44	- $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);	42	+ if ( data.user && data.user.activated === false){
		43	+ // usuário criado E não verificado o e-mail
		44	+
		45	+ }
		46	+
		47	+ if ( data.user && data.user.activated === true){
		48	+ // usuário criado E não verificado o e-mail
		49	+ var currentUser = Session.create(data);
45		50
		51	+ $rootScope.currentUser = currentUser;
		52	+ $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
		53	+ }
		54	+
		55	+ $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
46	return response;	56	return response;
47	}, function(response) {	57	}, function(response) {
48	$log.debug('AuthService.register [FAIL] response', response);	58	$log.debug('AuthService.register [FAIL] response', response);