From 0bd5891df3b7468dc5dc8ba7f38c70b1fa89a9c0 Mon Sep 17 00:00:00 2001
From: David <darranz@rodax-software.com>
Date: Sat, 12 Mar 2022 12:03:31 +0100
Subject: [PATCH] API v3

---
 config/environments/development.js               |  2 +-
 config/environments/production.js                |  4 ++--
 core/router.js                                   |  8 ++++----
 modules/auth/auth.controller.js                  | 10 ++++++----
 modules/events/events_inscriptions.controller.js |  2 +-
 server.js                                        |  2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/config/environments/development.js b/config/environments/development.js
index 0fc838b..53d432a 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -20,7 +20,7 @@ module.exports = {
 
     server: {
         hostname: process.env.HOSTNAME || '127.0.0.1',
-        port: process.env.PORT || 18888,
+        port: process.env.PORT || 19999,
         public_url: ""
     },
 
diff --git a/config/environments/production.js b/config/environments/production.js
index f152fd1..e8a3643 100644
--- a/config/environments/production.js
+++ b/config/environments/production.js
@@ -29,8 +29,8 @@ module.exports = {
 
     server: {
             hostname: process.env.HOSTNAME || '127.0.0.1',
-            port: process.env.PORT || 18888,
-            public_url: "https://apiapp2.loquedeverdadimporta.org/api/v2"
+            port: process.env.PORT || 19999,
+            public_url: "https://apiapp2.loquedeverdadimporta.org/api/v3"
     },
 
     cdn: {
diff --git a/core/router.js b/core/router.js
index 415e9ac..3f64e5a 100644
--- a/core/router.js
+++ b/core/router.js
@@ -18,7 +18,7 @@ const globOptions = {
 module.exports = function () {
     const router = express.Router({ mergeParams: true });
 
-    router.get('/v2/_health', (req, res, next) => {
+    router.get('/v3/_health', (req, res, next) => {
         res.json({
             code: 200,
             message: 'success',
@@ -29,13 +29,13 @@ module.exports = function () {
     // APICACHE
 
     // route to display cache index
-    router.get('/v2/cache/index', (req, res) => {
+    router.get('/v3/cache/index', (req, res) => {
         res.json(apicache.getIndex())
     });
 
 
     // route to clear target group
-    router.get('/v2/cache/clear/:target?', (req, res) => {
+    router.get('/v3/cache/clear/:target?', (req, res) => {
         res.json(apicache.clear(req.params.target))
     });
 
@@ -45,7 +45,7 @@ module.exports = function () {
 
     glob.sync("**/*.routes.js", globOptions)
         .forEach(function (file) {
-            router.use('/v2', require(file));
+            router.use('/v3', require(file));
     });
     
     return router;
diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index 88451a9..c64cfbc 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -164,9 +164,11 @@ async function register(req, res, next) {
   console.log("register - appVersion: ", appVersion);
 
   //Comprobamos si el usuario ya existe en nuestro sistema
+  console.log("COMPROBAMOS SI EXISTE EN NUESTRO SISTEMA", values.phone);
   let newUser = await authService.extraMethods.findUserByPhone(values.phone);
-  console.log("COMPROBAMOS IS EXISTE EN NUESTRO SISTEMA", newUser);
+
   if (!newUser) {
+    console.log("NO EXISTE");
     try {
       const data = {
         //refresh_token: tokens.refreshToken,
@@ -467,7 +469,7 @@ async function getOrCreateUser(req, res, next) {
 
   //console.log(">>>>>>>>>>>>>>>>>>>>  getOrCreateUser", dataUser.userResult.user.Entity);  
   //Refrescamos datos que nos interesan
-  dataUser.id = dataUser.userResult.user.id; 
+  dataUser.id = dataUser.userResult.user.id;
   dataUser.entityId = dataUser.userResult.user.Entity
     ? dataUser.userResult.user.Entity.id
     : null;
@@ -478,11 +480,11 @@ async function getOrCreateUser(req, res, next) {
     ? dataUser.userResult.user.Entity.level
     : null;
 
-  dataUser.email = dataUser.userResult.user ? dataUser.userResult.user.email : null;    
+  dataUser.email = dataUser.userResult.user ? dataUser.userResult.user.email : null;
   dataUser.phone = dataUser.userResult.user ? dataUser.userResult.user.phone : null; //((req.body.phone != '+34') ? req.body.phone : null), lo quitamos de momento por la de movistar
   dataUser.name = dataUser.userResult.user ? dataUser.userResult.user.name : null;
   dataUser.surname = dataUser.userResult.user ? dataUser.userResult.user.surname : null;
-;
+  ;
   //Reasignamos a variable de entorno
   res.locals.dataUser = dataUser;
   next();
diff --git a/modules/events/events_inscriptions.controller.js b/modules/events/events_inscriptions.controller.js
index df4f1b2..0677320 100644
--- a/modules/events/events_inscriptions.controller.js
+++ b/modules/events/events_inscriptions.controller.js
@@ -315,7 +315,7 @@ const extraControllers = {
           dataInscription.event.id,
           dataUser.userResult.user.id,
           dataInscription.type,
-          false, //validated,
+          true, //validated,
           dataInscription.source,
           null,
           null
diff --git a/server.js b/server.js
index 9f44331..a7ea65c 100644
--- a/server.js
+++ b/server.js
@@ -13,7 +13,7 @@ const currentState = assign(
     launchedAt: Date.now(),
     appPath: process.cwd(),
     //host: process.env.HOST || process.env.HOSTNAME || 'localhost',
-    //port: process.env.PORT || 18888,
+    //port: process.env.PORT || 19999,
     environment: toLower(process.env.NODE_ENV) || "development",
     connections: {},
   },