diff --git a/src/app/account/register-component.html b/src/app/account/register-component.html index a6590bb..5f2f0e6 100644 --- a/src/app/account/register-component.html +++ b/src/app/account/register-component.html @@ -3,6 +3,14 @@

{{"account.register.welcomeMessageTitle" | translate }}

+ +
+

{{ "account.register.errorMessagesTitle" | translate }}

+ +
+
@@ -17,10 +25,12 @@  {{ ctrl.environment.host }}
-
-
    -
  • -
+
+
+
    +
  • +
+
@@ -29,22 +39,26 @@
-
- +
+
+
    +
  • +
+
- +
-
-
    -
  • -
+
+
+
    +
  • +
+
@@ -55,7 +69,7 @@
@@ -72,6 +86,5 @@
-

{{"account.register.haveAccountMessage" | translate}}

- + {{"account.register.haveAccountMessage" | translate}} diff --git a/src/app/account/register-terms.html b/src/app/account/register-terms.html index de90dbe..b3877bf 100644 --- a/src/app/account/register-terms.html +++ b/src/app/account/register-terms.html @@ -1,5 +1,5 @@
-

Register terms

+

{{ "account.register.termsOfUseTitle" | translate }} - {{ ctrl.environment.name }}

diff --git a/src/app/account/register.component.spec.ts b/src/app/account/register.component.spec.ts index dff6240..8c6d124 100644 --- a/src/app/account/register.component.spec.ts +++ b/src/app/account/register.component.spec.ts @@ -1,29 +1,25 @@ import { ComponentTestHelper, createClass } from "../../spec/component-test-helper"; import * as helpers from "../../spec/helpers"; import { RegisterComponent } from "./register.component"; -// import {RegisterService} from "../../lib/ng-noosfero-api/http/register.service" - describe("Register Component", () => { const htmlTemplate: string = ''; let helper: ComponentTestHelper; let registerService = helpers.mocks.registerService; - let stateService = jasmine.createSpyObj("$state", ["transitionTo"]); + let stateService: angular.ui.IStateService; let notificationService = helpers.mocks.notificationService; notificationService.success = jasmine.createSpy('success'); notificationService.error = jasmine.createSpy('error'); - - - let account: any = { - id: 1, - login: 'test', - email: 'test@email.com', - password: 'xxx', - passwordConfirmation: 'xxx' - }; + let user_data: any; + let response: any; + let deferred: any; + let $rootScope: ng.IRootScopeService; + let $q: ng.IQService; beforeEach(() => { + stateService = jasmine.createSpyObj("$state", ["transitionTo"]); + angular.mock.module('templates'); angular.mock.module('ngSanitize'); angular.mock.module('ngMessages'); @@ -45,8 +41,53 @@ describe("Register Component", () => { helper = new ComponentTestHelper(cls, done); }); + beforeEach(inject((_$rootScope_: ng.IRootScopeService, _$q_: ng.IQService) => { + $rootScope = _$rootScope_; + $q = _$q_; + })); + it('register page was rendered', () => { expect(helper.debugElement.query('div.register-page').length).toEqual(1); }); + it("registers a new user", done => { + user_data = { username: "username", password: "password", password_confirmation: "password", email: "user@company.com" }; + response = { }; + + helper.component.account = user_data; + + deferred = $q.defer(); + deferred.resolve({ data: response }); + registerService.createAccount = jasmine.createSpy("createAccount").and.returnValue(deferred.promise); + + helper.component.signup(); + $rootScope.$apply(); + + expect(registerService.createAccount).toHaveBeenCalledWith(user_data); + expect(stateService.transitionTo).toHaveBeenCalledWith("main.environment"); + expect(notificationService.success).toHaveBeenCalled(); + + done(); + }); + + it("gives error when registration fails", done => { + user_data = { password: "pas" }; + response = { data: { message: '{ "password": ["is too short"] }'}}; + + helper.component.account = user_data; + + deferred = $q.defer(); + deferred.reject(response); + registerService.createAccount = jasmine.createSpy("createAccount").and.returnValue(deferred.promise); + + helper.component.signup(); + $rootScope.$apply(); + + expect(registerService.createAccount).toHaveBeenCalledWith(user_data); + + expect(stateService.transitionTo).not.toHaveBeenCalledWith("main.environment"); + expect(notificationService.error).toHaveBeenCalled(); + + done(); + }); }); diff --git a/src/app/account/register.component.ts b/src/app/account/register.component.ts index 2a0b528..3265a56 100644 --- a/src/app/account/register.component.ts +++ b/src/app/account/register.component.ts @@ -3,7 +3,8 @@ import { RegisterService } from "./../../lib/ng-noosfero-api/http/register.servi import { NotificationService } from "./../shared/services/notification.service"; import { EnvironmentService } from "../../lib/ng-noosfero-api/http/environment.service"; import { RegisterController } from "./register.controller"; -import { IModalComponent } from "../shared/components/interfaces"; +import { AuthController } from "./../login"; +import { IModalComponent, IErrorMessages } from "../shared/components/interfaces"; @Component({ selector: 'noosfero-register', @@ -23,7 +24,7 @@ export class RegisterComponent { constructor( private $state: ng.ui.IStateService, private $uibModal: ng.ui.bootstrap.IModalService, - private $scope: ng.IScope, + private $scope: IErrorMessages, public registerService: RegisterService, private notificationService: NotificationService, private environmentService: EnvironmentService @@ -33,19 +34,27 @@ export class RegisterComponent { } signup() { - if (this.account.password === this.account.passwordConfirmation) { - this.registerService.createAccount(this.account).then((response) => { - - if (response.status === 201) { - this.$state.transitionTo('main.environment'); - this.notificationService.success({ title: "account.register.success.title", message: "account.register.success.message" }); - } else { - throw new Error('Invalid attributes'); - } - }); - } else { - this.notificationService.error({ message: "account.register.passwordConfirmation.failed" }); - } + let error = ''; + let errors: any; + let field = ''; + this.$scope.errorMessages = []; + this.registerService.createAccount(this.account).then((response) => { + this.$state.transitionTo('main.environment'); + this.notificationService.success({ title: "account.register.success.title", message: "account.register.success.message" }); + }).catch((response) => { + if ( response.data.error ) { + errors = response.data['error'].split(', '); + for (error in errors) { + this.$scope.errorMessages.push({ message: errors[error] }); + } + } else if ( response.data.message ) { + errors = JSON.parse(response.data.message); + for (field in errors) { + this.$scope.errorMessages.push({ fieldName: field, message: errors[field][0] }); + } + } + this.notificationService.error({ title: "account.register.save.failed" }); + }); } isInvalid(field: any): any { @@ -63,4 +72,14 @@ export class RegisterComponent { scope: this.$scope }); } + + openLogin() { + this.modalInstance = this.$uibModal.open({ + templateUrl: 'app/login/login.html', + controller: AuthController, + controllerAs: 'vm', + bindToController: true + }); + } + } diff --git a/src/app/account/scss/register.scss b/src/app/account/scss/register.scss index 00277e1..ef35ffe 100644 --- a/src/app/account/scss/register.scss +++ b/src/app/account/scss/register.scss @@ -29,6 +29,7 @@ .register-page .already-registered-message { margin-top: 60px; text-align: center; + display: block; } .register-page input { diff --git a/src/app/shared/components/interfaces.ts b/src/app/shared/components/interfaces.ts index 8f932a4..9bc96d0 100644 --- a/src/app/shared/components/interfaces.ts +++ b/src/app/shared/components/interfaces.ts @@ -6,3 +6,7 @@ export interface IModalComponent { $uibModal: ng.ui.bootstrap.IModalService; modalInstance: ng.ui.bootstrap.IModalServiceInstance; } + +export interface IErrorMessages extends ng.IScope { + errorMessages: any; +} diff --git a/src/app/shared/messages/form-errors.html b/src/app/shared/messages/form-errors.html new file mode 100644 index 0000000..3af858d --- /dev/null +++ b/src/app/shared/messages/form-errors.html @@ -0,0 +1,4 @@ +
  • +
  • +
  • +
  • diff --git a/src/languages/en.json b/src/languages/en.json index de958ff..32ea703 100644 --- a/src/languages/en.json +++ b/src/languages/en.json @@ -112,6 +112,7 @@ "account.register.signupMessage": "Register", "account.register.haveAccountMessage": "Already have an account?", "account.register.termsOfUseMessage": "terms of use", + "account.register.termsOfUseTitle": "Terms of use", "account.register.success.title": "Good job!", "account.register.success.message": "Account created!", "account.register.passwordConfirmation.failed": "Wrong password confirmation", @@ -119,5 +120,20 @@ "messages.invalid.maxlength": "This field is too long", "messages.invalid.minlength": "This field is too short", "messages.invalid.email": "This needs to be a valid email", - "messages.invalid.passwordMatch": "Your passwords did not match" + "messages.invalid.passwordMatch": "Your passwords did not match", + "account.register.save.failed": "This account could not be created", + "account.register.mandatoryField": "This field is mandatory", + "account.register.invalidEmail": "This field must be a valid email address.", + "account.register.shortPassword": "The password must have at least 4 characters)", + "account.register.errorMessagesTitle": "There were problems with the following fields:", + "email is missing": "email can't be blank", + "login is missing": "username can't be blank", + "password is missing": "password can't be blank", + "login": "username", + "has already been taken": "has already been taken", + "email": "email", + "identifier": "identifier", + "is not available.": "is not available", + "user": "user", + "is invalid": "is invalid" } diff --git a/src/languages/messages.html b/src/languages/messages.html deleted file mode 100644 index 3af858d..0000000 --- a/src/languages/messages.html +++ /dev/null @@ -1,4 +0,0 @@ -
  • -
  • -
  • -
  • diff --git a/src/languages/pt.json b/src/languages/pt.json index bf47b27..2bfd6c5 100644 --- a/src/languages/pt.json +++ b/src/languages/pt.json @@ -113,6 +113,7 @@ "account.register.passwordConfirmationLabel": "Confirmar senha", "account.register.accountCreatingMessage": "Ao criar uma conta, você está concordando com os ", "account.register.termsOfUseMessage": "termos de uso", + "account.register.termsOfUseTitle": "Termos de uso", "account.register.signupMessage": "Criar Conta", "account.register.haveAccountMessage": "Já possui uma conta?", "account.register.success.title": "Bom trabalho!", @@ -122,5 +123,20 @@ "messages.invalid.maxlength": "O valor é muito longo", "messages.invalid.minlength": "O valor é muito curto", "messages.invalid.email": "Informe um email válido", - "messages.invalid.passwordMatch": "As senhas não coincidem" + "messages.invalid.passwordMatch": "As senhas não coincidem", + "account.register.save.failed": "A conta não pode ser criada", + "account.register.mandatoryField": "Este campo é obrigatório", + "account.register.invalidEmail": "Este campo deve ser um endereço de e-mail válido.", + "account.register.shortPassword": "A senha deve ter no mínimo 4 caracteres", + "account.register.errorMessagesTitle": "Houve erros com os seguintes campos:", + "email is missing": "email não pode ficar em branco", + "login is missing": "nome de usuário não pode ficar em branco", + "password is missing": "senha não pode ficar em branco", + "login": "nome de usuário", + "has already been taken": "já está sendo usado", + "email": "email", + "identifier": "identificador", + "is not available.": "não está disponível", + "user": "usuário", + "is invalid": "é inválido" } -- libgit2 0.21.2