From 8fd04d3b1c554d1588181422255e115fc966630d Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Sun, 29 Dec 2019 01:53:51 +0100
Subject: [PATCH] - added Aportador Solidario to registration - added
 email_paypal and username_telegram

---
 src/server/models/user.js         | 14 ++++++++++----
 src/server/router/index_router.js |  9 ++++++++-
 src/server/tools/shared_nodejs.js |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/server/models/user.js b/src/server/models/user.js
index e6dbd9d..9e47e26 100644
--- a/src/server/models/user.js
+++ b/src/server/models/user.js
@@ -34,9 +34,6 @@ var UserSchema = new mongoose.Schema({
       message: '{VALUE} is not a valid email'
     }*/
   },
-  cell: {
-    type: String,
-  },
   idapp: {
     type: String,
     required: true,
@@ -111,6 +108,9 @@ var UserSchema = new mongoose.Schema({
   news_on: {
     type: Boolean
   },
+  aportador_solidario: {
+    type: String,
+  },
   profile: {
     img: {
       type: String
@@ -118,6 +118,12 @@ var UserSchema = new mongoose.Schema({
     cell: {
       type: String
     },
+    email_paypal: {
+      type: String
+    },
+    username_telegram: {
+      type: String
+    },
     dateofbirth: {
       type: Date,
     },
@@ -376,7 +382,7 @@ UserSchema.statics.getUsersListByParams = function (params) {
  */
 
 UserSchema.statics.getFieldsForSearch = function () {
-  return ['name', 'surname', 'email', 'cell']
+  return ['name', 'surname', 'email', 'profile.cell', 'profile.email_paypal', 'profile.username_telegram', 'aportador_solidario']
 };
 
 UserSchema.statics.executeQueryTable = function (idapp, params) {
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index 0533ad8..3948f75 100644
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -246,7 +246,8 @@ router.patch('/chval', authenticate, (req, res) => {
 
   tools.mylogshow('PATCH CHVAL: ', id, fieldsvalue);
 
-  if (!User.isAdmin(req.user) && !User.isManager(req.user)) {
+  // If I change my record...
+  if ((!User.isAdmin(req.user) && !User.isManager(req.user)) || (req.user._id === id)) {
     // If without permissions, exit
     return res.status(404).send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: '' });
   }
@@ -388,6 +389,11 @@ router.get('/loadsite/:userId/:idapp/:sall', authenticate_noerror, (req, res) =>
   return Promise.all([bookedevent, eventlist, operators, wheres, contribtype, settings, permissions, disciplines, newstosent, mailinglist, mypage, gallery])
     .then((arrdata) => {
       // console.table(arrdata);
+      const myuser = req.user;
+      if (myuser) {
+        myuser.password = '';
+      }
+
       res.send({
         bookedevent: arrdata[0],
         eventlist: arrdata[1],
@@ -401,6 +407,7 @@ router.get('/loadsite/:userId/:idapp/:sall', authenticate_noerror, (req, res) =>
         mailinglist: arrdata[9],
         mypage: arrdata[10],
         gallery: arrdata[11],
+        myuser,
       });
     })
     .catch((e) => {
diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js
index 62cdf68..9478fdb 100644
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -12,7 +12,7 @@ module.exports = {
   },
 
   fieldsUserToChange() {
-    return ['_id', 'username', 'email', 'cell', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on']
+    return ['_id', 'username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'ipaddr', 'lasttimeonline', 'profile', 'news_on', 'aportador_solidario']
   }
 
 };