From fe245294a070b6eeb264cf549446fd62ec5428e4 Mon Sep 17 00:00:00 2001
From: Eduardo Mathias <ems19@inf.ufpr.br>
Date: Wed, 12 Jul 2023 10:01:40 -0300
Subject: [PATCH] [FIX] Origin and email
---
src/libs/middlewares/oauth2.js | 7 ++++++-
src/libs/routes_v1/user.js | 7 +++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/libs/middlewares/oauth2.js b/src/libs/middlewares/oauth2.js
index 2c85f516..5d8ba39f 100644
--- a/src/libs/middlewares/oauth2.js
+++ b/src/libs/middlewares/oauth2.js
@@ -11,6 +11,11 @@ const User = require(`${libs}/models/user`);
const AccessToken = require(`${libs}/models/accessToken`);
const RefreshToken = require(`${libs}/models/refreshToken`);
+const origin_to_secret = {
+ 'SimCAQ': 'FcmZp9bZpk8yxSJA',
+ 'LDE': 'LDE'
+};
+
// create OAuth 2.0 server
let aserver = oauth2orize.createServer()
@@ -67,7 +72,7 @@ aserver.exchange(oauth2orize.exchange.password(function(client, username, passwo
return done(null, false);
}
- if(user.dataValues.origin != client.client_secret){
+ if(origin_to_secret[user.dataValues.origin] != client.client_secret){
console.log("Erro de client_secret");
return done(null, false);
}
diff --git a/src/libs/routes_v1/user.js b/src/libs/routes_v1/user.js
index 37d22d42..1a6044cc 100644
--- a/src/libs/routes_v1/user.js
+++ b/src/libs/routes_v1/user.js
@@ -98,6 +98,7 @@ userApp.get('/me', passport.authenticate('bearer', { session: false }), (req, re
u._id = u.id;
u.institutionName = u.institution_name;
u.receiveEmails = u.receive_email;
+ u.receive_emails = u.receive_email;
delete u.id;
delete u.institution_name;
delete u.receive_email;
@@ -122,6 +123,7 @@ userApp.get('/:id', (req, res, next) => {
u._id = u.id;
u.institutionName = u.institution_name;
u.receiveEmails = u.receive_email;
+ u.receive_emails = u.receive_email;
delete u.id;
delete u.institution_name;
delete u.receive_email;
@@ -162,7 +164,7 @@ userApp.post('/', async (req, res, next) => {
institution_name: req.body.institutionName,
state: req.body.state,
city: req.body.city,
- receiveEmails: false || req.body.receiveEmails,
+ receive_email: false || req.body.receiveEmails || req.body.receive_emails,
origin: req.body.origin,
citesegment: req.body.citesegment,
citerole: req.body.citerole,
@@ -241,7 +243,7 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), async (
user.institutionName = req.body.institutionName || user.institutionName;
user.state = req.body.state || user.state;
user.city = req.body.city || user.city;
- user.receive_email = req.body.receiveEmails || user.receive_email;
+ user.receive_email = req.body.receiveEmails || req.body.receive_emails || user.receive_email;
user.citesegment = req.body.citesegment || user.citesegment;
user.citerole = req.body.citerole || user.citerole;
@@ -277,6 +279,7 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), async (
u._id = u.id;
u.institutionName = u.institution_name;
u.receiveEmails = u.receive_email;
+ u.receive_emails = u.receive_email;
delete u.id;
delete u.institution_name;
delete u.receive_email;
--
GitLab