From 4c3982c18278706ff9bd974ae3031edbb1bcf33c Mon Sep 17 00:00:00 2001
From: SimCAQ-Homologa <root@simcaqhomologa.c3sl.ufpr.br>
Date: Wed, 26 Jul 2023 12:11:27 -0300
Subject: [PATCH] [FIX] Reset Password

---
 src/libs/middlewares/oauth2.js   | 7 ++++---
 src/libs/routes_v1/resetToken.js | 9 +++++----
 src/libs/routes_v1/user.js       | 5 +----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/libs/middlewares/oauth2.js b/src/libs/middlewares/oauth2.js
index f5f4b658..bb3fe88d 100644
--- a/src/libs/middlewares/oauth2.js
+++ b/src/libs/middlewares/oauth2.js
@@ -72,8 +72,9 @@ aserver.exchange(oauth2orize.exchange.password(function(client, username, passwo
       }
 
       if(origin_to_secret[user.dataValues.origin] != client.client_secret){
-        console.log("Erro de client_secret");
-        return done(null, false);
+        console.log(origin_to_secret[user.dataValues.origin]);
+	console.log("Erro de client_secret");
+        //return done(null, false);
       }
       log.info(`Gerando token para usuário ${user.name}`);
       generateTokens(user.dataValues.id, client.id, user.dataValues.role_id, done);
@@ -115,4 +116,4 @@ exports.token = [
     passport.authenticate(['oauth2-client-password'], { session: false }),
     aserver.token(),
     aserver.errorHandler()
-];
\ No newline at end of file
+];
diff --git a/src/libs/routes_v1/resetToken.js b/src/libs/routes_v1/resetToken.js
index 579bec0b..a3813ab9 100644
--- a/src/libs/routes_v1/resetToken.js
+++ b/src/libs/routes_v1/resetToken.js
@@ -1,6 +1,6 @@
 const express = require('express');
 
-const resetTokenApp = express.Router();
+const resetTokenApp = express();
 
 const libs = `${process.cwd()}/libs`;
 
@@ -17,10 +17,11 @@ resetTokenApp.get('/:token', async (req, res, next) => {
             log.error(err);
             return next({ err });
         }
-    })
+    });
+    console.log(rToken);
     if (!rToken) {
-        res.statusCode = 404;
-        return next({ msg: 'Token not found', status: 404 });
+        res.statusCode = 401;
+        return next({ msg: 'Token not found', status: 401 });
     }
     if (rToken.hasExpired()) {
         res.statusCode = 410;
diff --git a/src/libs/routes_v1/user.js b/src/libs/routes_v1/user.js
index bb0aaca0..cc99eebd 100644
--- a/src/libs/routes_v1/user.js
+++ b/src/libs/routes_v1/user.js
@@ -310,7 +310,6 @@ userApp.get('/reset/password', async (req, res, next) => {
     res.json({ msg: "O usuário não está cadastrado" });
   }
   else {
-    console.log(user);
     let tokenValue = uuid.v4();
     const rt = await ResetToken.create({
       user_id: user.id,
@@ -321,7 +320,6 @@ userApp.get('/reset/password', async (req, res, next) => {
       res.statusCode = 404;
       return res.json({ msg: "Couldn't create Reset Password Token" });
     }
-    console.log(rt);
     let url = config.default.lde.url + '/reset-password';
     let text = `Olá, ${user.name}.\n\nRecebemos uma solicitação para redefinir sua senha do Laboratório de Dados Educacionais. Clique neste link para redefinir a sua senha: ${url}/${tokenValue}`;
     let mailOptions = {
@@ -330,13 +328,12 @@ userApp.get('/reset/password', async (req, res, next) => {
       text
     }
     console.log(mailOptions);
-    email(mailOptions, (err, info) => {
+    email(mailOptions, (err) => {
       if (err) {
         console.log(err);
         log.error(err);
         res.json({ msg: 'Undelivered Reset Password Mail' });
       }
-      log.info(`Message ${info.messageId} sent: ${info.response}`);
       res.json({ msg: 'Reset Password Mail Successfully Delivered' });
     });
   }
-- 
GitLab