lqdvi/app2-api
2
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

API v3

Browse Source
This commit is contained in:
David Arranz 2022-03-12 12:03:31 +01:00
parent 11b00e9a16
commit 0bd5891df3
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/environments/development.js
View File

@ -20,7 +20,7 @@ module.exports = {
server: { server: {
hostname: process.env.HOSTNAME || '127.0.0.1', hostname: process.env.HOSTNAME || '127.0.0.1',
port: process.env.PORT || 18888, port: process.env.PORT || 19999,
public_url: "" public_url: ""
}, },

4
config/environments/production.js
View File

@ -29,8 +29,8 @@ module.exports = {
server: { server: {
hostname: process.env.HOSTNAME || '127.0.0.1', hostname: process.env.HOSTNAME || '127.0.0.1',
port: process.env.PORT || 18888, port: process.env.PORT || 19999,
public_url: "https://apiapp2.loquedeverdadimporta.org/api/v2" public_url: "https://apiapp2.loquedeverdadimporta.org/api/v3"
}, },
cdn: { cdn: {

8
core/router.js
View File

@ -18,7 +18,7 @@ const globOptions = {
module.exports = function () { module.exports = function () {
const router = express.Router({ mergeParams: true }); const router = express.Router({ mergeParams: true });
router.get('/v2/_health', (req, res, next) => { router.get('/v3/_health', (req, res, next) => {
res.json({ res.json({
code: 200, code: 200,
message: 'success', message: 'success',
@ -29,13 +29,13 @@ module.exports = function () {
// APICACHE // APICACHE
// route to display cache index // route to display cache index
router.get('/v2/cache/index', (req, res) => { router.get('/v3/cache/index', (req, res) => {
res.json(apicache.getIndex()) res.json(apicache.getIndex())
}); });
// route to clear target group // 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)) res.json(apicache.clear(req.params.target))
}); });
@ -45,7 +45,7 @@ module.exports = function () {
glob.sync("**/*.routes.js", globOptions) glob.sync("**/*.routes.js", globOptions)
.forEach(function (file) { .forEach(function (file) {
router.use('/v2', require(file)); router.use('/v3', require(file));
}); });
return router; return router;

10
modules/auth/auth.controller.js
View File

@ -164,9 +164,11 @@ async function register(req, res, next) {
console.log("register - appVersion: ", appVersion); console.log("register - appVersion: ", appVersion);
//Comprobamos si el usuario ya existe en nuestro sistema //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); let newUser = await authService.extraMethods.findUserByPhone(values.phone);
console.log("COMPROBAMOS IS EXISTE EN NUESTRO SISTEMA", newUser);
if (!newUser) { if (!newUser) {
console.log("NO EXISTE");
try { try {
const data = { const data = {
//refresh_token: tokens.refreshToken, //refresh_token: tokens.refreshToken,
@ -467,7 +469,7 @@ async function getOrCreateUser(req, res, next) {
//console.log(">>>>>>>>>>>>>>>>>>>> getOrCreateUser", dataUser.userResult.user.Entity); //console.log(">>>>>>>>>>>>>>>>>>>> getOrCreateUser", dataUser.userResult.user.Entity);
//Refrescamos datos que nos interesan //Refrescamos datos que nos interesan
dataUser.id = dataUser.userResult.user.id; dataUser.id = dataUser.userResult.user.id;
dataUser.entityId = dataUser.userResult.user.Entity dataUser.entityId = dataUser.userResult.user.Entity
? dataUser.userResult.user.Entity.id ? dataUser.userResult.user.Entity.id
: null; : null;
@ -478,11 +480,11 @@ async function getOrCreateUser(req, res, next) {
? dataUser.userResult.user.Entity.level ? dataUser.userResult.user.Entity.level
: null; : 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.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.name = dataUser.userResult.user ? dataUser.userResult.user.name : null;
dataUser.surname = dataUser.userResult.user ? dataUser.userResult.user.surname : null; dataUser.surname = dataUser.userResult.user ? dataUser.userResult.user.surname : null;
; ;
//Reasignamos a variable de entorno //Reasignamos a variable de entorno
res.locals.dataUser = dataUser; res.locals.dataUser = dataUser;
next(); next();

2
modules/events/events_inscriptions.controller.js
View File

@ -315,7 +315,7 @@ const extraControllers = {
dataInscription.event.id, dataInscription.event.id,
dataUser.userResult.user.id, dataUser.userResult.user.id,
dataInscription.type, dataInscription.type,
false, //validated, true, //validated,
dataInscription.source, dataInscription.source,
null, null,
null null

2
server.js
View File

@ -13,7 +13,7 @@ const currentState = assign(
launchedAt: Date.now(), launchedAt: Date.now(),
appPath: process.cwd(), appPath: process.cwd(),
//host: process.env.HOST || process.env.HOSTNAME || 'localhost', //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", environment: toLower(process.env.NODE_ENV) || "development",
connections: {}, connections: {},
}, },