Download as
Browse Code »

Commit ada42c1873e2e76f52119f57b24577d4ec8f1f62

Authored by Leonardo Merlin
2 parents 9647dae0 d952ba61
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'master' into fix-issues

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
src/app/components/auth/auth.service.js
  Diff comments   View file @ada42c1
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser); 52 $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
53 } 53 }
54 54
55 - $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser); 55 + $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, data.user);
56 return response; 56 return response;
57 }, function(response) { 57 }, function(response) {
58 $log.debug('AuthService.register [FAIL] response', response); 58 $log.debug('AuthService.register [FAIL] response', response);
src/app/pages/auth/auth.controller.js
  Diff comments   View file @ada42c1
@@ -155,11 +155,11 @@ @@ -155,11 +155,11 @@
155 case 400: // bad request 155 case 400: // bad request
156 var errors = JSON.parse(response.data.message); 156 var errors = JSON.parse(response.data.message);
157 if(errors && errors.email){ 157 if(errors && errors.email){
158 - vm.signupErrorMessage = "E-mail já está em uso." 158 + vm.signupErrorMessage = 'E-mail já está em uso.';
159 } 159 }
160 break; 160 break;
161 case 500: 161 case 500:
162 - vm.signupErrorMessage = message; 162 + vm.signupErrorMessage = response.data.message;
163 break; 163 break;
164 default: 164 default:
165 break; 165 break;