Merge pull request 'refs #5769 fix(web-access): email rule' (!1684) from 5769-hotFix_client_web-access_email2 into master

Reviewed-on: #1684
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

back/methods/vn-user/privileges.js

@@ -47,7 +47,7 @@ module.exports = Self => {
         const user = await Self.findById(userId, {fields: ['hasGrant']}, myOptions);
 
         const userToUpdate = await Self.findById(id, {
-            fields: ['id', 'name', 'hasGrant', 'roleFk', 'password'],
+            fields: ['id', 'name', 'hasGrant', 'roleFk', 'password', 'email'],
             include: {
                 relation: 'role',
                 scope: {

back/models/vn-user.js

@@ -20,7 +20,7 @@ module.exports = function(Self) {
     Self.validatesFormatOf('email', {
         message: 'Invalid email',
         allowNull: true,
-        allowBlank: true,
+        allowBlank: false,
         with: /^[\w|.|-]+@[\w|-]+(\.[\w|-]+)*(,[\w|.|-]+@[\w|-]+(\.[\w|-]+)*)*$/
     });
 

modules/client/front/web-access/index.html

@@ -39,7 +39,7 @@
                 label="Recovery email"
                 ng-model="$ctrl.account.email"
                 info="This email is used for user to regain access their account."
-                rule="VnUser.name">
+                rule="VnUser.email">
             </vn-textfield>
         </vn-horizontal>
     </vn-card>