From d7986447c47839491c3a1cea5f6f691276513dd1 Mon Sep 17 00:00:00 2001
From: Gabriel Matte <gabrielmatte@msn.com>
Date: Fri, 18 Oct 2024 18:16:24 -0400
Subject: [PATCH] fix login error + auth callback

---
 client/src/main.tsx               | 2 ++
 server/auth/auth-manager.js       | 2 +-
 server/auth/modules/simpleauth.js | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/main.tsx b/client/src/main.tsx
index e4c3824..92ba734 100644
--- a/client/src/main.tsx
+++ b/client/src/main.tsx
@@ -1,3 +1,5 @@
+process.env['base']
+
 import ReactDOM from 'react-dom/client';
 import App from './App.tsx';
 
diff --git a/server/auth/auth-manager.js b/server/auth/auth-manager.js
index 90c4168..bc16fb9 100644
--- a/server/auth/auth-manager.js
+++ b/server/auth/auth-manager.js
@@ -44,7 +44,7 @@ class AuthManager{
 
     async login(userInfo,req,res,next){
         const tokenToSave = jwt.create(userInfo.email, userInfo._id);
-        res.redirect(`/auth/callback?user=${tokenToSave}`);
+        res.redirect(`${process.env['FRONTEND_URL']}/auth/callback?user=${tokenToSave}`);
         console.info(`L'utilisateur '${userInfo.name}' vient de se connecter`)
     }
 
diff --git a/server/auth/modules/simpleauth.js b/server/auth/modules/simpleauth.js
index 366011e..4e048db 100644
--- a/server/auth/modules/simpleauth.js
+++ b/server/auth/modules/simpleauth.js
@@ -54,7 +54,9 @@ class SimpleAuth{
             self.authmanager.login(user,req,res,next)
         }
         catch (error) {
-            return next(error);
+            return res.status(400).json({
+                message: error.message
+            });
         }
     }