Daniela Feitosa · Caio Almeida · Leandro Santos · Daniela Feitosa · Daniela Feitosa · Daniela Feitosa
Showing 16 changed files Show diff stats
src/app/login/auth.controller.spec.ts
src/app/login/auth.controller.ts
src/app/login/auth.service.ts
src/app/login/forgot-password.html
src/app/login/login.html
src/app/login/login.scss
src/app/login/new-password.component.spec.ts
src/app/login/new-password.component.ts
src/app/login/new-password.html
src/app/main/main.component.ts
src/app/shared/services/notification.service.ts
src/languages/en.json
src/languages/pt.json
src/lib/ng-noosfero-api/http/password.service.spec.ts
src/lib/ng-noosfero-api/http/password.service.ts
src/spec/mocks.ts
 import {AuthController} from "./auth.controller";
 import {AuthService} from "./auth.service";
+import * as helpers from "./../../spec/helpers";
  
 describe("Controllers", () => {
  
  
     describe("AuthController", () => {
  
-        it("calls authenticate on AuthService when login called", () => {
+        let $modal: any;
+        let notificationService = helpers.mocks.notificationService;
+        notificationService.success = jasmine.createSpy('info');
+        notificationService.error = jasmine.createSpy('error');
  
-            // creating a Mock AuthService
-            let AuthServiceMock: AuthService = jasmine.createSpyObj("AuthService", ["login"]);
+        let authController: any;
+        let AuthServiceMock: AuthService;
+        let username: string;
  
-            // pass AuthServiceMock into the constructor
-            let authController = new AuthController(null, null, AuthServiceMock);
+        beforeEach(() => {
+            $modal = helpers.mocks.$modal;
+            AuthServiceMock = jasmine.createSpyObj("AuthService", ["login",
+"forgotPassword"]);
+            authController = new AuthController(null, null, AuthServiceMock, $modal, notificationService);
+        });
  
-            // setup of authController -> set the credentials instance property
-            let credentials = { username: "username", password: "password" };
  
+        it("calls authenticate on AuthService when login called", () => {
+            let credentials = { username: "username", password: "password" };
             authController.credentials = credentials;
-
-            // calls the authController login method
             authController.login();
-
-            // checks if the method login of the injected AuthService has been called
             expect(AuthServiceMock.login).toHaveBeenCalledWith(credentials);
-
         });
  
+        it('should open forgot password on click', (done: Function) => {
+            spyOn($modal, "open");
+            authController.openForgotPassword();
+            expect($modal.open).toHaveBeenCalled();
+            expect($modal.open).toHaveBeenCalledWith({
+                templateUrl: 'app/login/forgot-password.html',
+                controller: AuthController,
+                controllerAs: 'vm',
+                bindToController: true
+            });
+            done();
+        });
  
+        it("calls forgotPassword on AuthService when sendPasswdInfo called", done => {
+            authController.username = "john";
+            AuthServiceMock.forgotPassword = jasmine.createSpy("forgotPassword").and.returnValue(Promise.resolve());
+            authController.sendPasswdInfo();
+            expect(AuthServiceMock.forgotPassword).toHaveBeenCalledWith("john");
+            done();
+        });
  
     });
 });
-import {AuthService} from "./auth.service";
+import { AuthService } from "./auth.service";
+import { NotificationService } from "./../shared/services/notification.service";
  
 export class AuthController {
  
-    static $inject = ["$log", "$stateParams", "AuthService"];
+    static $inject = ["$log", "$stateParams", "AuthService", "$uibModal", "NotificationService"];
+    modalInstance: ng.ui.bootstrap.IModalServiceInstance;
  
     constructor(
         private $log: ng.ILogService,
         private $stateParams: any,
-        private AuthService: AuthService
+        private AuthService: AuthService,
+        private $uibModal: ng.ui.bootstrap.IModalService,
+        private notificationService: NotificationService
     ) {
  
     }
  
     credentials: noosfero.Credentials;
+    username: string;
  
     login() {
         this.AuthService.login(this.credentials);
     }
+
+    openForgotPassword() {
+        this.modalInstance = this.$uibModal.open({
+            templateUrl: 'app/login/forgot-password.html',
+            controller: AuthController,
+            controllerAs: 'vm',
+            bindToController: true,
+        });
+    }
+
+    sendPasswdInfo() {
+        this.AuthService.forgotPassword(this.username).then((response) => {
+            this.notificationService.info({ title: "forgotPasswd.email_sent.title.info", message: "forgotPasswd.email_sent.message.info" });
+        }).catch((response) => {
+            this.notificationService.error({ title: "forgotPasswd.not_found.title.error", message: "forgotPasswd.not_found.message.error" });
+            this.openForgotPassword();
+        });
+    }
 }
@@ -2,11 +2,12 @@ import {Injectable, Inject, EventEmitter} from &quot;ng-forward&quot;;
  
 import {NoosferoRootScope, UserResponse} from "./../shared/models/interfaces";
 import {SessionService} from "./session.service";
+import { RestangularService } from "./../../lib/ng-noosfero-api/http/restangular_service";
  
 import {AuthEvents} from "./auth-events";
  
 @Injectable()
-@Inject("$http", SessionService, "$log")
+@Inject("$http", SessionService, "$log", "Restangular")
 export class AuthService {
  
     public loginSuccess: EventEmitter<noosfero.User> = new EventEmitter<noosfero.User>();
@@ -15,7 +16,10 @@ export class AuthService {
  
     constructor(private $http: ng.IHttpService,
         private sessionService: SessionService,
-        private $log: ng.ILogService) {
+        private $log: ng.ILogService,
+        private Restangular: restangular.IService
+    ) {
+        this.Restangular = Restangular;
     }
  
     loginFromCookie() {
@@ -76,4 +80,9 @@ export class AuthService {
             throw new Error(`The event: ${eventName} not exists`);
         }
     }
+
+    forgotPassword(value: string): ng.IPromise<noosfero.RestResult<any>> {
+        return this.Restangular.all("").customPOST("", "forgot_password", {value: value});
+    }
+
 }
@@ -0,0 +1,20 @@
+<div class="modal-header">
+  <h3 class="modal-title">{{"auth.form.forgot_passwd" | translate}}</h3>
+</div>
+<div class="modal-body">
+  <form name="forgotPasswdForm">
+    <div class="form-group" ng-class="{'has-error': forgotPasswdForm.username.$error.required }">
+      <label for="forgotPasswdLogin">{{"auth.form.login" | translate}}</label>
+      <input type="text" name="username" class="form-control" id="forgotPasswdLogin" placeholder="{{'auth.form.login' | translate}}" ng-model="vm.username"  required>
+        <div class="help-block" ng-messages="forgotPasswdForm.username.$error">
+          <div ng-if="forgotPasswdForm.username.$touched">
+            <ul class="list-unstyled">
+              <li ng-messages-include="app/shared/messages/form-errors.html"></li>
+            </ul>
+          </div>
+        </div>
+    </div>
+    <button type="submit" class="btn btn-default btn-block" ng-click="vm.sendPasswdInfo(); $close()" ng-disabled="forgotPasswdForm.$invalid">{{"forgotPasswd.send_instructions_button" | translate}}</button>
+  </form>
+  <p>{{"forgotPasswd.info" | translate}}</p>
+</div>
@@ -18,6 +18,9 @@
           {{"auth.form.keepLoggedIn" | translate}}
         </label>
       </div>
+      <div class="pull-right">
+        <a ng-click="vm.openForgotPassword()" href="">{{"auth.form.forgot_passwd" | translate}}</a>
+      </div>
     </div>
     <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
   </form>
@@ -10,6 +10,12 @@
       margin-top: 20px;
       text-transform: uppercase;
     }
+    .form-inline {
+      display: inline;
+      div {
+        display: inline-block;
+      }
+    }
   }
 }
  
@@ -0,0 +1,87 @@
+import { ComponentTestHelper, createClass } from "../../spec/component-test-helper";
+import * as helpers from "../../spec/helpers";
+import { PasswordComponent } from "./new-password.component";
+
+
+describe("Password Component", () => {
+   const htmlTemplate: string = '<new-password></new-password>';
+
+   let helper: ComponentTestHelper<PasswordComponent>;
+   let passwordService = helpers.mocks.passwordService;
+   let stateService = jasmine.createSpyObj("$state", ["transitionTo"]);
+   let stateParams = jasmine.createSpyObj("$stateParams", ["code"]);
+   let notificationService = helpers.mocks.notificationService;
+   notificationService.success = jasmine.createSpy('success');
+   notificationService.error = jasmine.createSpy('error');
+
+
+   let data: any;
+
+   beforeEach(() => {
+        angular.mock.module('templates');
+        angular.mock.module('ngSanitize');
+        angular.mock.module('ngMessages');
+        angular.mock.module('ngPassword');
+    });
+
+    beforeEach((done) => {
+        let cls = createClass({
+            template: htmlTemplate,
+            directives: [PasswordComponent],
+            providers: [
+                helpers.createProviderToValue('$state', stateService),
+                helpers.createProviderToValue('$stateParams', stateParams),
+                helpers.createProviderToValue('PasswordService', passwordService),
+                helpers.createProviderToValue('NotificationService', notificationService),
+            ]
+        });
+        helper = new ComponentTestHelper<PasswordComponent>(cls, done);
+    });
+
+    it('new password page was rendered', () => {
+        expect(helper.debugElement.query('div.new-password-page').length).toEqual(1);
+    });
+
+    it("changes the user password", done => {
+        data = {
+           code: '1234567890',
+           password: 'test',
+           passwordConfirmation: 'test'
+        };
+
+        helper.component.code = data.code;
+        helper.component.password = data.password;
+        helper.component.passwordConfirmation = data.passwordConfirmation;
+
+        passwordService.new_password = jasmine.createSpy("new_password").and.returnValue(Promise.resolve());
+
+        helper.component.sendNewPassword();
+        expect(passwordService.new_password).toHaveBeenCalledWith('1234567890', 'test', 'test');
+
+        expect(notificationService.success).toHaveBeenCalled();
+
+        done();
+    });
+
+    it("fails when try to change the user password", done => {
+        data = {
+           code: '1234567890',
+           password: 'test',
+           passwordConfirmation: 'test-invalid'
+        };
+
+        helper.component.code = data.code;
+        helper.component.password = data.password;
+        helper.component.passwordConfirmation = data.passwordConfirmation;
+
+        passwordService.new_password = jasmine.createSpy("new_password").and.returnValue(Promise.reject({data: {message: 'Error'}}));
+
+        helper.component.sendNewPassword();
+        expect(passwordService.new_password).toHaveBeenCalledWith('1234567890', 'test', 'test-invalid');
+
+        expect(notificationService.error).toHaveBeenCalled();
+
+        done();
+    });
+
+});
@@ -0,0 +1,36 @@
+import { StateConfig, Component, Inject, provide } from 'ng-forward';
+
+import { PasswordService } from "../../lib/ng-noosfero-api/http/password.service";
+import { NotificationService } from "./../shared/services/notification.service";
+import { AuthController } from "./auth.controller";
+
+@Component({
+    selector: 'new-password',
+    templateUrl: 'app/login/new-password.html',
+    providers: [provide('passwordService', { useClass: PasswordService })]
+})
+@Inject(PasswordService, "$state", "$stateParams", NotificationService)
+export class PasswordComponent {
+
+    code: string;
+    password: string;
+    passwordConfirmation: string;
+
+    constructor(
+        public passwordService: PasswordService,
+        private $state: ng.ui.IStateService,
+        private $stateParams: ng.ui.IStateParamsService,
+        private notificationService: NotificationService) {
+
+        this.code = this.$stateParams['code'];
+    }
+
+    sendNewPassword() {
+        this.passwordService.new_password(this.code, this.password, this.passwordConfirmation).then((response) => {
+            this.notificationService.success({ title: "newPasswd.success.title", message: "newPasswd.success.message", timer: 5000 });
+            this.$state.transitionTo('main.environment');
+        }).catch((response) => {
+            this.notificationService.error({ title: "newPasswd.failed.title", message: "newPasswd.failed.message" });
+        });
+    }
+}
@@ -0,0 +1,31 @@
+<div class="new-password-page col-xs-4 col-xs-offset-4">
+  <h1>{{"new_password.welcomeMessageTitle" | translate }}</h1>
+
+  <form name="newPasswdForm">
+    <div class="form-group" ng-class="{'has-error': newPasswdForm.password.$invalid && newPasswdForm.password.$touched }">
+      <div class="input-group">
+        <span class="input-group-addon"><i class="fa fa-lock"></i></span>
+        <input type="password" class="form-control" id="password" name="password" placeholder="{{'account.register.passwordLabel' | translate }}" ng-model="vm.password" required minlength="4">
+      </div>
+      <div class="help-block" ng-show="newPasswdForm.password.$touched" ng-messages="newPasswdForm.password.$error">
+        <ul class="list-unstyled">
+          <li ng-messages-include="app/shared/messages/form-errors.html"></li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="form-group" ng-class="{'has-error': newPasswdForm.passwordConfirm.$invalid && newPasswdForm.passwordConfirm.$touched }">
+      <div class="input-group">
+        <span class="input-group-addon"><i class="fa fa-unlock-alt"></i></span>
+        <input type="password" class="form-control" id="passwordConfirm" name="passwordConfirm" match-password="password" placeholder="{{'account.register.passwordConfirmationLabel' | translate}}" ng-model="vm.passwordConfirmation" required>
+      </div>
+      <div class="help-block" ng-show="newPasswdForm.passwordConfirm.$touched" ng-messages="newPasswdForm.passwordConfirm.$error">
+        <ul class="list-unstyled">
+          <li ng-messages-include="app/shared/messages/form-errors.html"></li>
+          <li ng-message="passwordMatch" translate="messages.invalid.passwordMatch"></li>
+        </ul>
+      </div>
+    </div>
+    <button type="submit" class="btn btn-default btn-block" ng-click="vm.sendNewPassword()" ng-disabled="newPasswdForm.$invalid">{{"newPasswdForm.submit" | translate}}</button>
+  </form>
+</div>
@@ -4,6 +4,7 @@ import { ArticleBlogComponent } from &quot;./../article/types/blog/blog.component&quot;;
  
 import { ArticleViewComponent } from "./../article/article-default-view.component";
  
+import { PasswordComponent } from "../login/new-password.component";
 import { ProfileComponent } from "../profile/profile.component";
 import { BoxesComponent } from "../layout/boxes/boxes.component";
 import { BlockContentComponent } from "../layout/blocks/block-content.component";
@@ -120,7 +121,8 @@ export class EnvironmentContent {
         MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent,
         LoginBlockComponent, CustomContentComponent, PermissionDirective, SearchFormComponent, SearchComponent,
         PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, RecentActivitiesPluginActivitiesBlockComponent,
-        ProfileImagesPluginProfileImagesBlockComponent, BlockComponent, RegisterComponent, TasksMenuComponent, TaskListComponent
+        ProfileImagesPluginProfileImagesBlockComponent, BlockComponent, RegisterComponent, TasksMenuComponent, TaskListComponent,
+        PasswordComponent
     ].concat(plugins.mainComponents).concat(plugins.hotspots),
     providers: [AuthService, SessionService, NotificationService, BodyStateClassesService,
         "ngAnimate", "ngCookies", "ngStorage", "ngTouch",
@@ -172,6 +174,18 @@ export class EnvironmentContent {
         }
     },
     {
+        url: "/account/new_password/:code",
+        component: PasswordComponent,
+        name: 'main.newPasswd',
+        views: {
+            "content": {
+                templateUrl: "app/login/new-password.html",
+                controller: PasswordComponent,
+                controllerAs: "vm"
+            }
+        }
+    },
+    {
         url: "^/:profile",
         abstract: true,
         component: ProfileComponent,
@@ -14,6 +14,8 @@ export class NotificationService {
     public static DEFAULT_ERROR_TITLE = "notification.error.default.title";
     public static DEFAULT_ERROR_MESSAGE = "notification.error.default.message";
     public static DEFAULT_SUCCESS_TIMER = 1000;
+    public static DEFAULT_INFO_TITLE = "notification.info.default.title";
+    public static DEFAULT_INFO_MESSAGE = "notification.info.default.message";
  
     error({
         message = NotificationService.DEFAULT_ERROR_MESSAGE,
@@ -40,6 +42,14 @@ export class NotificationService {
         this.showMessage({ title: title, text: message, showCancelButton: showCancelButton, type: type, closeOnConfirm: false }, confirmationFunction);
     }
  
+    info({
+        message = NotificationService.DEFAULT_INFO_MESSAGE,
+        title = NotificationService.DEFAULT_INFO_TITLE,
+        showConfirmButton = true
+    } = {}) {
+        this.showMessage({ title: title, text: message, showConfirmButton: showConfirmButton, type: "info" });
+    }
+
     private showMessage({title, text, type = "success", timer = null, showConfirmButton = true, showCancelButton = false, closeOnConfirm = true}, confirmationFunction: Function = null) {
         this.$log.debug("Notification message:", title, text, type, this.translatorService.currentLanguage());
         this.SweetAlert.swal({
@@ -34,8 +34,15 @@
   "auth.form.login": "Username or Email address",
   "auth.form.password": "Password",
   "auth.form.keepLoggedIn": "Keep me logged in",
+  "auth.form.forgot_passwd": "Forgot your password?",
   "auth.form.login_button": "Login",
   "auth.createAccount": "Create account",
+  "forgotPasswd.send_instructions_button": "Send instructions",
+  "forgotPasswd.info": "Upon clicking on the button above, you'll receive an email with instructions on how to create a new password.",
+  "forgotPasswd.email_sent.title.info": "Change your password",
+  "forgotPasswd.email_sent.message.info": "Follow the instructions sent by email to change your password",
+  "forgotPasswd.not_found.title.error": "User not found",
+  "forgotPasswd.not_found.message.error": "Could not send password recovery for the user",
   "navbar.content_viewer_actions.new_item": "New Item",
   "navbar.profile_actions.new_item": "New Item",
   "navbar.content_viewer_actions.new_post": "New Post",
@@ -43,6 +50,8 @@
   "navbar.profile_actions.new_discussion": "New Discussion",
   "notification.error.default.message": "Something went wrong!",
   "notification.error.default.title": "Oops...",
+  "notification.info.default.message": "",
+  "notification.info.default.title": "Information",
   "notification.profile.not_found": "Page not found",
   "notification.http_error.401.message": "Unauthorized",
   "notification.http_error.500.message": "Server error",
@@ -34,8 +34,15 @@
   "auth.form.login": "Nome de usuário ou Email",
   "auth.form.password": "Senha",
   "auth.form.keepLoggedIn": "Continuar logado",
+  "auth.form.forgot_passwd": "Esqueceu sua senha?",
   "auth.form.login_button": "Login",
   "auth.createAccount": "Criar conta",
+  "forgotPasswd.send_instructions_button": "Send instructions",
+  "forgotPasswd.info": "Ao clicar no botão acima, você receberá um email com instruções para criar uma nova senha.",
+  "forgotPasswd.email_sent.title.info": "Altere sua senha",
+  "forgotPasswd.email_sent.message.info": "Siga as instruções enviadas por e-mail para alterar sua senha",
+  "forgotPasswd.not_found.title.error": "Usuário não encontrado",
+  "forgotPasswd.not_found.message.error": "Não foi possível recuperar a senha deste usuário",
   "navbar.content_viewer_actions.new_item": "Novo Item",
   "navbar.profile_actions.new_item": "Novo Item",
   "navbar.content_viewer_actions.new_post": "Novo Post",
@@ -43,6 +50,8 @@
   "navbar.profile_actions.new_discussion": "Nova Discussão",
   "notification.error.default.message": "Algo deu errado!",
   "notification.error.default.title": "Oops...",
+  "notification.info.default.message": "",
+  "notification.info.default.title": "Informação",
   "notification.profile.not_found": "Página não encontrada",
   "notification.http_error.401.message": "Não autorizado",
   "notification.http_error.500.message": "Erro no servidor",
@@ -0,0 +1,41 @@
+import { PasswordService } from "./password.service";
+
+describe("Services", () => {
+
+    describe("Password Service", () => {
+
+        let $httpBackend: ng.IHttpBackendService;
+        let passwordService: PasswordService;
+        let $rootScope: ng.IRootScopeService;
+        let data: any;
+
+        beforeEach(angular.mock.module("main", ($translateProvider: angular.translate.ITranslateProvider) => {
+            $translateProvider.translations('en', {});
+        }));
+
+        beforeEach(inject((_$httpBackend_: ng.IHttpBackendService,
+_PasswordService_: PasswordService, _$rootScope_: ng.IRootScopeService) => {
+            $httpBackend = _$httpBackend_;
+            passwordService = _PasswordService_;
+            $rootScope = _$rootScope_;
+        }));
+
+        describe("Succesfull request", () => {
+
+            it("should change user password", (done) => {
+               data = {
+                  code: '1234567890',
+                  password: 'test',
+                  password_confirmation: 'test'
+                };
+
+                $httpBackend.expectPATCH(`/api/v1/new_password?code=${data.code}&password=${data.password}&password_confirmation=${data.password_confirmation}`).respond(201, [{ login: "test" }]);
+                passwordService.new_password('1234567890', 'test', 'test').then((response: restangular.IResponse) => {
+                    expect(response.data[0].login).toEqual("test");
+                    done();
+                });
+                $httpBackend.flush();
+            });
+        });
+    });
+});
@@ -0,0 +1,14 @@
+import { Injectable, Inject } from "ng-forward";
+import { RestangularService } from "./restangular_service";
+
+@Injectable()
+@Inject("Restangular")
+export class PasswordService {
+    constructor(private Restangular: restangular.IService) {
+        this.Restangular = Restangular;
+    }
+
+    new_password(code: string, password: string, password_confirmation: string): ng.IPromise<noosfero.RestResult<noosfero.User>> {
+        return this.Restangular.all("").customOperation("patch", "new_password", {code: code, password: password, password_confirmation: password_confirmation });
+    }
+}
@@ -257,6 +257,11 @@ export var mocks: any = {
         changeLanguage: (lang: string) => { },
         translate: (text: string) => { return text; }
     },
+    passwordService: {
+        new_password: (param: any) => {
+            return Promise.resolve({ status: 201 });
+        }
+    },
     notificationService: {
         success: () => { },
         confirmation: () => { },
1	1	import {AuthController} from "./auth.controller";
2	2	import {AuthService} from "./auth.service";
	3	+import * as helpers from "./../../spec/helpers";
3	4
4	5	describe("Controllers", () => {
5	6
6	7
7	8	describe("AuthController", () => {
8	9
9		- it("calls authenticate on AuthService when login called", () => {
	10	+ let $modal: any;
	11	+ let notificationService = helpers.mocks.notificationService;
	12	+ notificationService.success = jasmine.createSpy('info');
	13	+ notificationService.error = jasmine.createSpy('error');
10	14
11		- // creating a Mock AuthService
12		- let AuthServiceMock: AuthService = jasmine.createSpyObj("AuthService", ["login"]);
	15	+ let authController: any;
	16	+ let AuthServiceMock: AuthService;
	17	+ let username: string;
13	18
14		- // pass AuthServiceMock into the constructor
15		- let authController = new AuthController(null, null, AuthServiceMock);
	19	+ beforeEach(() => {
	20	+ $modal = helpers.mocks.$modal;
	21	+ AuthServiceMock = jasmine.createSpyObj("AuthService", ["login",
	22	+"forgotPassword"]);
	23	+ authController = new AuthController(null, null, AuthServiceMock, $modal, notificationService);
	24	+ });
16	25
17		- // setup of authController -> set the credentials instance property
18		- let credentials = { username: "username", password: "password" };
19	26
	27	+ it("calls authenticate on AuthService when login called", () => {
	28	+ let credentials = { username: "username", password: "password" };
20	29	authController.credentials = credentials;
21		-
22		- // calls the authController login method
23	30	authController.login();
24		-
25		- // checks if the method login of the injected AuthService has been called
26	31	expect(AuthServiceMock.login).toHaveBeenCalledWith(credentials);
27		-
28	32	});
29	33
	34	+ it('should open forgot password on click', (done: Function) => {
	35	+ spyOn($modal, "open");
	36	+ authController.openForgotPassword();
	37	+ expect($modal.open).toHaveBeenCalled();
	38	+ expect($modal.open).toHaveBeenCalledWith({
	39	+ templateUrl: 'app/login/forgot-password.html',
	40	+ controller: AuthController,
	41	+ controllerAs: 'vm',
	42	+ bindToController: true
	43	+ });
	44	+ done();
	45	+ });
30	46
	47	+ it("calls forgotPassword on AuthService when sendPasswdInfo called", done => {
	48	+ authController.username = "john";
	49	+ AuthServiceMock.forgotPassword = jasmine.createSpy("forgotPassword").and.returnValue(Promise.resolve());
	50	+ authController.sendPasswdInfo();
	51	+ expect(AuthServiceMock.forgotPassword).toHaveBeenCalledWith("john");
	52	+ done();
	53	+ });
31	54
32	55	});
33	56	});
...	...
1		-import {AuthService} from "./auth.service";
	1	+import { AuthService } from "./auth.service";
	2	+import { NotificationService } from "./../shared/services/notification.service";
2	3
3	4	export class AuthController {
4	5
5		- static $inject = ["$log", "$stateParams", "AuthService"];
	6	+ static $inject = ["$log", "$stateParams", "AuthService", "$uibModal", "NotificationService"];
	7	+ modalInstance: ng.ui.bootstrap.IModalServiceInstance;
6	8
7	9	constructor(
8	10	private $log: ng.ILogService,
9	11	private $stateParams: any,
10		- private AuthService: AuthService
	12	+ private AuthService: AuthService,
	13	+ private $uibModal: ng.ui.bootstrap.IModalService,
	14	+ private notificationService: NotificationService
11	15	) {
12	16
13	17	}
14	18
15	19	credentials: noosfero.Credentials;
	20	+ username: string;
16	21
17	22	login() {
18	23	this.AuthService.login(this.credentials);
19	24	}
	25	+
	26	+ openForgotPassword() {
	27	+ this.modalInstance = this.$uibModal.open({
	28	+ templateUrl: 'app/login/forgot-password.html',
	29	+ controller: AuthController,
	30	+ controllerAs: 'vm',
	31	+ bindToController: true,
	32	+ });
	33	+ }
	34	+
	35	+ sendPasswdInfo() {
	36	+ this.AuthService.forgotPassword(this.username).then((response) => {
	37	+ this.notificationService.info({ title: "forgotPasswd.email_sent.title.info", message: "forgotPasswd.email_sent.message.info" });
	38	+ }).catch((response) => {
	39	+ this.notificationService.error({ title: "forgotPasswd.not_found.title.error", message: "forgotPasswd.not_found.message.error" });
	40	+ this.openForgotPassword();
	41	+ });
	42	+ }
20	43	}
...	...
...	...	@@ -2,11 +2,12 @@ import {Injectable, Inject, EventEmitter} from "ng-forward";
2	2
3	3	import {NoosferoRootScope, UserResponse} from "./../shared/models/interfaces";
4	4	import {SessionService} from "./session.service";
	5	+import { RestangularService } from "./../../lib/ng-noosfero-api/http/restangular_service";
5	6
6	7	import {AuthEvents} from "./auth-events";
7	8
8	9	@Injectable()
9		-@Inject("$http", SessionService, "$log")
	10	+@Inject("$http", SessionService, "$log", "Restangular")
10	11	export class AuthService {
11	12
12	13	public loginSuccess: EventEmitter<noosfero.User> = new EventEmitter<noosfero.User>();
...	...	@@ -15,7 +16,10 @@ export class AuthService {
15	16
16	17	constructor(private $http: ng.IHttpService,
17	18	private sessionService: SessionService,
18		- private $log: ng.ILogService) {
	19	+ private $log: ng.ILogService,
	20	+ private Restangular: restangular.IService
	21	+ ) {
	22	+ this.Restangular = Restangular;
19	23	}
20	24
21	25	loginFromCookie() {
...	...	@@ -76,4 +80,9 @@ export class AuthService {
76	80	throw new Error(`The event: ${eventName} not exists`);
77	81	}
78	82	}
	83	+
	84	+ forgotPassword(value: string): ng.IPromise<noosfero.RestResult<any>> {
	85	+ return this.Restangular.all("").customPOST("", "forgot_password", {value: value});
	86	+ }
	87	+
79	88	}
...	...
...	...	@@ -0,0 +1,20 @@
	1	+<div class="modal-header">
	2	+ <h3 class="modal-title">{{"auth.form.forgot_passwd" \| translate}}</h3>
	3	+</div>
	4	+<div class="modal-body">
	5	+ <form name="forgotPasswdForm">
	6	+ <div class="form-group" ng-class="{'has-error': forgotPasswdForm.username.$error.required }">
	7	+ <label for="forgotPasswdLogin">{{"auth.form.login" \| translate}}</label>
	8	+ <input type="text" name="username" class="form-control" id="forgotPasswdLogin" placeholder="{{'auth.form.login' \| translate}}" ng-model="vm.username" required>
	9	+ <div class="help-block" ng-messages="forgotPasswdForm.username.$error">
	10	+ <div ng-if="forgotPasswdForm.username.$touched">
	11	+ <ul class="list-unstyled">
	12	+ <li ng-messages-include="app/shared/messages/form-errors.html"></li>
	13	+ </ul>
	14	+ </div>
	15	+ </div>
	16	+ </div>
	17	+ <button type="submit" class="btn btn-default btn-block" ng-click="vm.sendPasswdInfo(); $close()" ng-disabled="forgotPasswdForm.$invalid">{{"forgotPasswd.send_instructions_button" \| translate}}</button>
	18	+ </form>
	19	+ <p>{{"forgotPasswd.info" \| translate}}</p>
	20	+</div>
...	...
...	...	@@ -18,6 +18,9 @@
18	18	{{"auth.form.keepLoggedIn" \| translate}}
19	19	</label>
20	20	</div>
	21	+ <div class="pull-right">
	22	+ <a ng-click="vm.openForgotPassword()" href="">{{"auth.form.forgot_passwd" \| translate}}</a>
	23	+ </div>
21	24	</div>
22	25	<button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" \| translate}}</button>
23	26	</form>
...	...
...	...	@@ -10,6 +10,12 @@
10	10	margin-top: 20px;
11	11	text-transform: uppercase;
12	12	}
	13	+ .form-inline {
	14	+ display: inline;
	15	+ div {
	16	+ display: inline-block;
	17	+ }
	18	+ }
13	19	}
14	20	}
15	21
...	...
...	...	@@ -0,0 +1,87 @@
	1	+import { ComponentTestHelper, createClass } from "../../spec/component-test-helper";
	2	+import * as helpers from "../../spec/helpers";
	3	+import { PasswordComponent } from "./new-password.component";
	4	+
	5	+
	6	+describe("Password Component", () => {
	7	+ const htmlTemplate: string = '<new-password></new-password>';
	8	+
	9	+ let helper: ComponentTestHelper<PasswordComponent>;
	10	+ let passwordService = helpers.mocks.passwordService;
	11	+ let stateService = jasmine.createSpyObj("$state", ["transitionTo"]);
	12	+ let stateParams = jasmine.createSpyObj("$stateParams", ["code"]);
	13	+ let notificationService = helpers.mocks.notificationService;
	14	+ notificationService.success = jasmine.createSpy('success');
	15	+ notificationService.error = jasmine.createSpy('error');
	16	+
	17	+
	18	+ let data: any;
	19	+
	20	+ beforeEach(() => {
	21	+ angular.mock.module('templates');
	22	+ angular.mock.module('ngSanitize');
	23	+ angular.mock.module('ngMessages');
	24	+ angular.mock.module('ngPassword');
	25	+ });
	26	+
	27	+ beforeEach((done) => {
	28	+ let cls = createClass({
	29	+ template: htmlTemplate,
	30	+ directives: [PasswordComponent],
	31	+ providers: [
	32	+ helpers.createProviderToValue('$state', stateService),
	33	+ helpers.createProviderToValue('$stateParams', stateParams),
	34	+ helpers.createProviderToValue('PasswordService', passwordService),
	35	+ helpers.createProviderToValue('NotificationService', notificationService),
	36	+ ]
	37	+ });
	38	+ helper = new ComponentTestHelper<PasswordComponent>(cls, done);
	39	+ });
	40	+
	41	+ it('new password page was rendered', () => {
	42	+ expect(helper.debugElement.query('div.new-password-page').length).toEqual(1);
	43	+ });
	44	+
	45	+ it("changes the user password", done => {
	46	+ data = {
	47	+ code: '1234567890',
	48	+ password: 'test',
	49	+ passwordConfirmation: 'test'
	50	+ };
	51	+
	52	+ helper.component.code = data.code;
	53	+ helper.component.password = data.password;
	54	+ helper.component.passwordConfirmation = data.passwordConfirmation;
	55	+
	56	+ passwordService.new_password = jasmine.createSpy("new_password").and.returnValue(Promise.resolve());
	57	+
	58	+ helper.component.sendNewPassword();
	59	+ expect(passwordService.new_password).toHaveBeenCalledWith('1234567890', 'test', 'test');
	60	+
	61	+ expect(notificationService.success).toHaveBeenCalled();
	62	+
	63	+ done();
	64	+ });
	65	+
	66	+ it("fails when try to change the user password", done => {
	67	+ data = {
	68	+ code: '1234567890',
	69	+ password: 'test',
	70	+ passwordConfirmation: 'test-invalid'
	71	+ };
	72	+
	73	+ helper.component.code = data.code;
	74	+ helper.component.password = data.password;
	75	+ helper.component.passwordConfirmation = data.passwordConfirmation;
	76	+
	77	+ passwordService.new_password = jasmine.createSpy("new_password").and.returnValue(Promise.reject({data: {message: 'Error'}}));
	78	+
	79	+ helper.component.sendNewPassword();
	80	+ expect(passwordService.new_password).toHaveBeenCalledWith('1234567890', 'test', 'test-invalid');
	81	+
	82	+ expect(notificationService.error).toHaveBeenCalled();
	83	+
	84	+ done();
	85	+ });
	86	+
	87	+});
...	...
...	...	@@ -0,0 +1,36 @@
	1	+import { StateConfig, Component, Inject, provide } from 'ng-forward';
	2	+
	3	+import { PasswordService } from "../../lib/ng-noosfero-api/http/password.service";
	4	+import { NotificationService } from "./../shared/services/notification.service";
	5	+import { AuthController } from "./auth.controller";
	6	+
	7	+@Component({
	8	+ selector: 'new-password',
	9	+ templateUrl: 'app/login/new-password.html',
	10	+ providers: [provide('passwordService', { useClass: PasswordService })]
	11	+})
	12	+@Inject(PasswordService, "$state", "$stateParams", NotificationService)
	13	+export class PasswordComponent {
	14	+
	15	+ code: string;
	16	+ password: string;
	17	+ passwordConfirmation: string;
	18	+
	19	+ constructor(
	20	+ public passwordService: PasswordService,
	21	+ private $state: ng.ui.IStateService,
	22	+ private $stateParams: ng.ui.IStateParamsService,
	23	+ private notificationService: NotificationService) {
	24	+
	25	+ this.code = this.$stateParams['code'];
	26	+ }
	27	+
	28	+ sendNewPassword() {
	29	+ this.passwordService.new_password(this.code, this.password, this.passwordConfirmation).then((response) => {
	30	+ this.notificationService.success({ title: "newPasswd.success.title", message: "newPasswd.success.message", timer: 5000 });
	31	+ this.$state.transitionTo('main.environment');
	32	+ }).catch((response) => {
	33	+ this.notificationService.error({ title: "newPasswd.failed.title", message: "newPasswd.failed.message" });
	34	+ });
	35	+ }
	36	+}
...	...
...	...	@@ -0,0 +1,31 @@
	1	+<div class="new-password-page col-xs-4 col-xs-offset-4">
	2	+ <h1>{{"new_password.welcomeMessageTitle" \| translate }}</h1>
	3	+
	4	+ <form name="newPasswdForm">
	5	+ <div class="form-group" ng-class="{'has-error': newPasswdForm.password.$invalid && newPasswdForm.password.$touched }">
	6	+ <div class="input-group">
	7	+ <span class="input-group-addon"><i class="fa fa-lock"></i></span>
	8	+ <input type="password" class="form-control" id="password" name="password" placeholder="{{'account.register.passwordLabel' \| translate }}" ng-model="vm.password" required minlength="4">
	9	+ </div>
	10	+ <div class="help-block" ng-show="newPasswdForm.password.$touched" ng-messages="newPasswdForm.password.$error">
	11	+ <ul class="list-unstyled">
	12	+ <li ng-messages-include="app/shared/messages/form-errors.html"></li>
	13	+ </ul>
	14	+ </div>
	15	+ </div>
	16	+
	17	+ <div class="form-group" ng-class="{'has-error': newPasswdForm.passwordConfirm.$invalid && newPasswdForm.passwordConfirm.$touched }">
	18	+ <div class="input-group">
	19	+ <span class="input-group-addon"><i class="fa fa-unlock-alt"></i></span>
	20	+ <input type="password" class="form-control" id="passwordConfirm" name="passwordConfirm" match-password="password" placeholder="{{'account.register.passwordConfirmationLabel' \| translate}}" ng-model="vm.passwordConfirmation" required>
	21	+ </div>
	22	+ <div class="help-block" ng-show="newPasswdForm.passwordConfirm.$touched" ng-messages="newPasswdForm.passwordConfirm.$error">
	23	+ <ul class="list-unstyled">
	24	+ <li ng-messages-include="app/shared/messages/form-errors.html"></li>
	25	+ <li ng-message="passwordMatch" translate="messages.invalid.passwordMatch"></li>
	26	+ </ul>
	27	+ </div>
	28	+ </div>
	29	+ <button type="submit" class="btn btn-default btn-block" ng-click="vm.sendNewPassword()" ng-disabled="newPasswdForm.$invalid">{{"newPasswdForm.submit" \| translate}}</button>
	30	+ </form>
	31	+</div>
...	...
...	...	@@ -4,6 +4,7 @@ import { ArticleBlogComponent } from "./../article/types/blog/blog.component";
4	4
5	5	import { ArticleViewComponent } from "./../article/article-default-view.component";
6	6
	7	+import { PasswordComponent } from "../login/new-password.component";
7	8	import { ProfileComponent } from "../profile/profile.component";
8	9	import { BoxesComponent } from "../layout/boxes/boxes.component";
9	10	import { BlockContentComponent } from "../layout/blocks/block-content.component";
...	...	@@ -120,7 +121,8 @@ export class EnvironmentContent {
120	121	MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent,
121	122	LoginBlockComponent, CustomContentComponent, PermissionDirective, SearchFormComponent, SearchComponent,
122	123	PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, RecentActivitiesPluginActivitiesBlockComponent,
123		- ProfileImagesPluginProfileImagesBlockComponent, BlockComponent, RegisterComponent, TasksMenuComponent, TaskListComponent
	124	+ ProfileImagesPluginProfileImagesBlockComponent, BlockComponent, RegisterComponent, TasksMenuComponent, TaskListComponent,
	125	+ PasswordComponent
124	126	].concat(plugins.mainComponents).concat(plugins.hotspots),
125	127	providers: [AuthService, SessionService, NotificationService, BodyStateClassesService,
126	128	"ngAnimate", "ngCookies", "ngStorage", "ngTouch",
...	...	@@ -172,6 +174,18 @@ export class EnvironmentContent {
172	174	}
173	175	},
174	176	{
	177	+ url: "/account/new_password/:code",
	178	+ component: PasswordComponent,
	179	+ name: 'main.newPasswd',
	180	+ views: {
	181	+ "content": {
	182	+ templateUrl: "app/login/new-password.html",
	183	+ controller: PasswordComponent,
	184	+ controllerAs: "vm"
	185	+ }
	186	+ }
	187	+ },
	188	+ {
175	189	url: "^/:profile",
176	190	abstract: true,
177	191	component: ProfileComponent,
...	...