back/methods/account/recover-password.js

@@ -1,26 +1,29 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
-    Self.remoteMethod('recoverPassword', {
+    Self.remoteMethodCtx('recoverPassword', {
         description: 'Send email to the user',
         accepts: [
             {
                 arg: 'email',
                 type: 'string',
                 description: 'The email of user',
-                required: false
+                required: true
             }
         ],
         http: {
             path: `/recoverPassword`,
-            verb: 'GET'
+            verb: 'POST'
         }
     });
 
-    Self.recoverPassword = async function(email) {
-        console.log('ENTRY');
+    Self.recoverPassword = async function(ctx, email) {
         const models = Self.app.models;
-        const user = await models.User.findOne({
+        const origin = ctx.req.headers.origin;
+        const ttl = 1209600;
+
+        const user = await models.Account.findOne({
+            fields: ['id', 'name', 'password'],
             where: {
                 email: email
             }
@@ -29,12 +32,12 @@ module.exports = Self => {
         if (!user)
             throw new UserError(`This email does not belong to a user`);
 
-        const token = await models.Account.login({
-            user: email,
-            password: user.password
+        const token = await models.AccessToken.create({
+            ttl: ttl,
+            userId: user.id
         });
 
-        await Self.rawSql(`CALL vn.mail_insert(?,?,?,?)`,
-            [email, null, 'Recovery Password', `?token=${token}`]);
+        return await Self.rawSql(`CALL vn.mail_insert(?,?,?,?)`,
+            [email, null, 'Recovery Password', `${origin}/#!/account/${user.id}/basic-data?access_token=${token.id}`]);
     };
 };

back/models/account.json

@@ -85,20 +85,27 @@
 			"principalType": "ROLE",
 			"principalId": "$everyone",
 			"permission": "ALLOW"
-		},
+        },
+        {
+            "property": "recoverPassword",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
 		{
-			"property": "logout",
+            "property": "logout",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
 		},
 		{
-			"property": "validateToken",
+            "property": "validateToken",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
-		}
+        }
 	]
 }

front/core/services/auth.js

@@ -7,7 +7,7 @@ import UserError from 'core/lib/user-error';
  * @property {Boolean} loggedIn Whether the user is currently logged
  */
 export default class Auth {
-    constructor($http, $q, $state, $transitions, $window, vnToken, vnModules, aclService) {
+    constructor($http, $q, $state, $transitions, $window, vnToken, vnModules, aclService, $location) {
         Object.assign(this, {
             $http,
             $q,
@@ -17,7 +17,8 @@ export default class Auth {
             vnToken,
             vnModules,
             aclService,
-            loggedIn: false
+            loggedIn: false,
+            $location
         });
     }
 
@@ -25,15 +26,18 @@ export default class Auth {
         let criteria = {
             to: state => !state.name.includes('login')
         };
+
+        this.vnToken.set(this.$location.$$search.access_token, false);
+        console.log(this.$location.$$search.access_token, false);
         this.$transitions.onStart(criteria, transition => {
             if (this.loggedIn)
                 return true;
 
             let redirectToLogin = () => {
-                return transition.router.stateService.target('login');
+                // return transition.router.stateService.target('login');
             };
 
-            if (this.vnToken.token) {
+            if (this.vnToken.token || this) {
                 return this.loadAcls()
                     .then(() => true)
                     .catch(redirectToLogin);
@@ -59,6 +63,7 @@ export default class Auth {
     }
 
     onLoginOk(json, remember) {
+        console.log(json.data.token);
         this.vnToken.set(json.data.token, remember);
 
         return this.loadAcls().then(() => {
@@ -79,7 +84,7 @@ export default class Auth {
         this.loggedIn = false;
         this.vnModules.reset();
         this.aclService.reset();
-        this.$state.go('login');
+        // this.$state.go('login');
 
         return promise;
     }
@@ -96,6 +101,6 @@ export default class Auth {
             });
     }
 }
-Auth.$inject = ['$http', '$q', '$state', '$transitions', '$window', 'vnToken', 'vnModules', 'aclService'];
+Auth.$inject = ['$http', '$q', '$state', '$transitions', '$window', 'vnToken', 'vnModules', 'aclService', '$location'];
 
 ngModule.service('vnAuth', Auth);

front/core/services/interceptor.js

@@ -11,7 +11,7 @@ function interceptor($q, vnApp, vnToken, $translate) {
         },
         request(config) {
             vnApp.pushLoader();
-
+            console.log(vnToken.token);
             if (config.url.charAt(0) !== '/' && apiPath)
                 config.url = `${apiPath}${config.url}`;
             if (vnToken.token)

front/salix/components/login/locale/es.yml

@@ -6,3 +6,4 @@ Enter: Entrar
 I do not remember my password: No recuerdo mi contraseña
 Recover password: Recuperar contraseña
 We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
+Notification sent!: ¡Notificación enviada!

front/salix/components/login/recover-password.js

@@ -5,11 +5,14 @@ import './style.scss';
  * A simple login form.
  */
 export default class Controller {
-    constructor($, $element, $http) {
+    constructor($scope, $element, $http, vnApp, $translate, $state) {
         Object.assign(this, {
-            $,
+            $scope,
             $element,
-            $http
+            $http,
+            vnApp,
+            $translate,
+            $state
         });
     }
 
@@ -18,11 +21,14 @@ export default class Controller {
             email: this.email
         };
 
-        this.$http.get('Accounts/recoverPassword', params)
-            .then(() => console.log('try')); // this.vnApp.showMessage(this.$t('Notification sent!')));
+        this.$http.post('Accounts/recoverPassword', params)
+            .then(() => {
+                this.vnApp.showSuccess(this.$translate.instant('Notification sent!'));
+                this.$state.go('login');
+            });
     }
 }
-Controller.$inject = ['$scope', '$element', '$http'];
+Controller.$inject = ['$scope', '$element', '$http', 'vnApp', '$translate', '$state'];
 
 ngModule.vnComponent('vnRecoverPassword', {
     template: require('./recover-password.html'),

front/salix/module.js

@@ -112,10 +112,10 @@ function $exceptionHandler(vnApp, $window, $state, $injector) {
 
             switch (exception.status) {
             case 401:
-                if ($state.current.name != 'login') {
+                if (!$state.current.name.includes('login')) {
                     messageT = 'Session has expired';
                     let params = {continue: $window.location.hash};
-                    $state.go('login', params);
+                    // $state.go('login', params);
                 } else
                     messageT = 'Invalid login';
                 break;