diff --git a/src/app/layout/blocks/login-block/login-block.component.spec.ts b/src/app/layout/blocks/login-block/login-block.component.spec.ts index ad72a2f..537ca8b 100644 --- a/src/app/layout/blocks/login-block/login-block.component.spec.ts +++ b/src/app/layout/blocks/login-block/login-block.component.spec.ts @@ -5,7 +5,7 @@ import {ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder'; import {providers} from 'ng-forward/cjs/testing/providers'; import {LoginBlockComponent} from './login-block.component'; import * as helpers from "./../../../../spec/helpers"; -import {SessionService, AuthService, AuthController, IAuthEvents, AUTH_EVENTS} from "./../../../login"; +import {SessionService, AuthService, AuthController, AuthEvents} from "./../../../login"; const htmlTemplate: string = ''; @@ -92,16 +92,18 @@ describe("Components", () => { * Simulate the AuthService loginSuccess event */ function simulateLoginEvent() { - let localScope: ng.IScope = helper.component["$scope"]; - localScope.$emit(AUTH_EVENTS.loginSuccess); + let successEvent: string = AuthEvents[AuthEvents.loginSuccess]; + + (helper.component.authService)[successEvent].next(user); } /** * Simulate the AuthService logoutSuccess event */ function simulateLogoutEvent() { - let localScope: ng.IScope = helper.component["$scope"]; - localScope.$emit(AUTH_EVENTS.logoutSuccess); + let successEvent: string = AuthEvents[AuthEvents.logoutSuccess]; + + (helper.component.authService)[successEvent].next(user); } }); diff --git a/src/app/layout/blocks/login-block/login-block.component.ts b/src/app/layout/blocks/login-block/login-block.component.ts index 3095da2..aba10f9 100644 --- a/src/app/layout/blocks/login-block/login-block.component.ts +++ b/src/app/layout/blocks/login-block/login-block.component.ts @@ -1,5 +1,5 @@ import {Input, Inject, Component} from "ng-forward"; -import {SessionService, AuthService, IAuthEvents, AUTH_EVENTS} from "./../../../login"; +import {SessionService, AuthService, AuthEvents} from "./../../../login"; /** * @ngdoc controller @@ -35,15 +35,15 @@ export class LoginBlockComponent { constructor( private session: SessionService, private $state: ng.ui.IStateService, - private authService: AuthService, + public authService: AuthService, private $scope: ng.IScope) { this.currentUser = this.session.currentUser(); - this.$scope.$on(AUTH_EVENTS.loginSuccess, () => { + this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => { this.currentUser = this.session.currentUser(); }); - this.$scope.$on(AUTH_EVENTS.logoutSuccess, () => { + this.authService.subscribe(AuthEvents[AuthEvents.logoutSuccess], () => { this.currentUser = this.session.currentUser(); }); diff --git a/src/lib/ng-noosfero-api/interfaces/person.ts b/src/lib/ng-noosfero-api/interfaces/person.ts index fbbdb04..486ad70 100644 --- a/src/lib/ng-noosfero-api/interfaces/person.ts +++ b/src/lib/ng-noosfero-api/interfaces/person.ts @@ -6,7 +6,5 @@ namespace noosfero { * A representation of a Person in Noosfero. */ export interface Person extends Profile { - created_at: string; - identifier: string; } } \ No newline at end of file diff --git a/src/lib/ng-noosfero-api/interfaces/profile.ts b/src/lib/ng-noosfero-api/interfaces/profile.ts index 6c3e316..6c5830a 100644 --- a/src/lib/ng-noosfero-api/interfaces/profile.ts +++ b/src/lib/ng-noosfero-api/interfaces/profile.ts @@ -22,6 +22,14 @@ namespace noosfero { * @returns {string} The unque identifier for the Profile */ identifier: string; + + /** + * @ngdoc property + * @name created_at + * @propertyOf noofero.Profile + * @returns {string} The timestamp this object was created + */ + created_at: string; /** * @ngdoc property diff --git a/src/spec/mocks.ts b/src/spec/mocks.ts index bd9bbe5..8be322b 100644 --- a/src/spec/mocks.ts +++ b/src/spec/mocks.ts @@ -68,6 +68,7 @@ export var mocks: any = { mocks.authService['logoutSuccess'].event(param); } }, + login: () => { }, logout: () => { }, subscribe: (eventName: string, fn: Function) => { mocks.authService[eventName].subscribe(fn); -- libgit2 0.21.2