gmatte/EvalueTonSavoir
1
0
Fork 0
mirror of https://github.com/ets-cfuhrman-pfe/EvalueTonSavoir.git synced 2025-08-11 21:23:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Roles done

Browse source
This commit is contained in:
MathieuSevignyLavallee 2024-10-19 13:13:16 -04:00
parent d7986447c4
commit e30681705f
14 changed files with 227 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/src/pages/AuthManager/AuthDrawer.tsx
View file

@ -15,7 +15,6 @@ const AuthSelection: React.FC = () => {
useEffect(() => {
const fetchData = async () => {
const data = await authService.fetchAuthData();
console.log(data);
setAuthData(data);
};

9
client/src/pages/AuthManager/callback/AuthCallback.tsx
View file

@ -1,7 +1,6 @@
import { useEffect } from 'react';
import { useNavigate, useLocation } from 'react-router-dom';
import apiService from '../../../services/ApiService';
import { jwtDecode } from 'jwt-decode';
const OAuthCallback: React.FC = () => {
const navigate = useNavigate();
@ -12,15 +11,7 @@ const OAuthCallback: React.FC = () => {
const user = searchParams.get('user');
if (user) {
// Save user data to localStorage or sessionStorage
console.log(user);
apiService.saveToken(user);
const decodedToken = jwtDecode(user);
const { email } = decodedToken as { email: string;};
console.log(email + " connected!");
// Navigate to the dashboard or another page
navigate('/');
} else {
navigate('/login');

3
client/src/pages/AuthManager/providers/OAuth-Oidc/ButtonAuth.tsx
View file

@ -1,5 +1,4 @@
import React from 'react';
import { ENV_VARIABLES } from '../../../../constants';
import '../css/buttonAuth.css';
interface ButtonAuthContainerProps {
@ -8,7 +7,7 @@ interface ButtonAuthContainerProps {
}
const handleAuthLogin = (provider: string) => {
window.location.href = `${ENV_VARIABLES.VITE_BACKEND_URL}/api/auth/` + provider;
window.location.href = `/api/auth/` + provider;
};
const ButtonAuth: React.FC<ButtonAuthContainerProps> = ({ providerName, providerType }) => {

10
client/src/pages/AuthManager/providers/SimpleLogin/Login.tsx
View file

@ -1,4 +1,4 @@
import { useNavigate, Link } from 'react-router-dom';
import { Link } from 'react-router-dom';
// JoinRoom.tsx
import React, { useEffect, useState } from 'react';
@ -11,7 +11,6 @@ import LoginContainer from '../../../../components/LoginContainer/LoginContainer
import ApiService from '../../../../services/ApiService';
const SimpleLogin: React.FC = () => {
const navigate = useNavigate();
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
@ -27,15 +26,10 @@ const SimpleLogin: React.FC = () => {
const login = async () => {
const result = await ApiService.login(email, password);
if (result != true) {
if (result !== true) {
setConnectionError(result);
return;
}
else {
navigate("/")
}
};

5
client/src/pages/AuthManager/providers/SimpleLogin/Register.tsx
View file

@ -1,5 +1,3 @@
import { useNavigate } from 'react-router-dom';
// JoinRoom.tsx
import React, { useEffect, useState } from 'react';
@ -10,7 +8,6 @@ import LoginContainer from '../../../../components/LoginContainer/LoginContainer
import ApiService from '../../../../services/ApiService';
const Register: React.FC = () => {
const navigate = useNavigate();
const [name, setName] = useState(''); // State for name
const [email, setEmail] = useState('');
@ -46,8 +43,6 @@ const Register: React.FC = () => {
setConnectionError(result);
return;
}
navigate("/login");
};
return (

52
client/src/services/ApiService.tsx
View file

@ -1,5 +1,5 @@
import axios, { AxiosError, AxiosResponse } from 'axios';
import {jwtDecode} from 'jwt-decode';
import { jwtDecode } from 'jwt-decode';
import { ENV_VARIABLES } from '../constants';
import { QuizType } from '../Types/QuizType';
@ -80,7 +80,6 @@ class ApiService {
public isLoggedInTeacher(): boolean {
const token = this.getToken();
console.log("Check if loggedIn : " + token);
if (token == null) {
return false;
@ -129,8 +128,12 @@ class ApiService {
const result: AxiosResponse = await axios.post(url, body, { headers: headers });
if (result.status !== 200) {
throw new Error(`L'enregistrement a échoué. Status: ${result.status}`);
console.log(result);
if (result.status == 200) {
window.location.href = result.request.responseURL;
}
else {
throw new Error(`La connexion a échoué. Status: ${result.status}`);
}
return true;
@ -152,11 +155,14 @@ class ApiService {
* @returns true if successful
* @returns A error string if unsuccessful,
*/
public async login(email: string, password: string): Promise<any> {
/**
* @returns true if successful
* @returns An error string if unsuccessful
*/
public async login(email: string, password: string): Promise<any> {
try {
if (!email || !password) {
throw new Error(`L'email et le mot de passe sont requis.`);
throw new Error("L'email et le mot de passe sont requis.");
}
const url: string = this.constructRequestUrl(`/auth/simple-auth/login`);
@ -165,26 +171,36 @@ class ApiService {
const result: AxiosResponse = await axios.post(url, body, { headers: headers });
if (result.status !== 200) {
throw new Error(`La connexion a échoué. Status: ${result.status}`);
}
this.saveToken(result.data.token);
// If login is successful, redirect the user
if (result.status === 200) {
window.location.href = result.request.responseURL;
return true;
} else {
throw new Error(`La connexion a échoué. Statut: ${result.status}`);
}
} catch (error) {
console.log("Error details: ", error);
console.log("Error details:", error);
// Handle Axios-specific errors
if (axios.isAxiosError(error)) {
const err = error as AxiosError;
const data = err.response?.data as { error: string } | undefined;
return data?.error || 'Erreur serveur inconnue lors de la requête.';
const responseData = err.response?.data as { message?: string } | undefined;
// If there is a message field in the response, print it
if (responseData?.message) {
console.log("Backend error message:", responseData.message);
return responseData.message;
}
return `Une erreur inattendue s'est produite.`
// If no message is found, return a fallback message
return "Erreur serveur inconnue lors de la requête.";
}
// Handle other non-Axios errors
return "Une erreur inattendue s'est produite.";
}
}
/**
* @returns true if successful

1
client/src/services/AuthService.tsx
View file

@ -15,7 +15,6 @@ class AuthService {
async fetchAuthData(){
try {
const response = await fetch(this.constructRequestUrl('/auth/getActiveAuth'));
console.log("base url: " + this.BASE_URL);
const data = await response.json();
return data.authActive;
} catch (error) {

2
docker-compose.yaml
View file

@ -7,8 +7,6 @@ services:
context: ./client
dockerfile: Dockerfile
container_name: frontend
environment:
VITE_BACKEND_URL: http://localhost:3000
ports:
- "5173:5173"
restart: always

4
server/auth/auth-manager.js
View file

@ -43,8 +43,8 @@ class AuthManager{
}
async login(userInfo,req,res,next){
const tokenToSave = jwt.create(userInfo.email, userInfo._id);
res.redirect(`${process.env['FRONTEND_URL']}/auth/callback?user=${tokenToSave}`);
const tokenToSave = jwt.create(userInfo.email, userInfo._id,userInfo.roles);
res.redirect(`/auth/callback?user=${tokenToSave}`);
console.info(`L'utilisateur '${userInfo.name}' vient de se connecter`)
}

24
server/auth/modules/passport-providers/oauth.js
View file

@ -5,13 +5,13 @@ var { hasNestedValue } = require('../../../utils')
var jwt = require('../../../middleware/jwtToken')
class PassportOAuth {
constructor(passportjs,auth_name){
constructor(passportjs, auth_name) {
this.passportjs = passportjs
this.auth_name = auth_name
}
register(app, passport,endpoint, name, provider) {
const cb_url =`${process.env['BACKEND_URL']}${endpoint}/${name}/callback`
register(app, passport, endpoint, name, provider) {
const cb_url = `${process.env['BACKEND_URL']}${endpoint}/${name}/callback`
const self = this
passport.use(name, new OAuth2Strategy({
@ -22,7 +22,7 @@ class PassportOAuth {
callbackURL: cb_url,
passReqToCallback: true
},
async function(req, accessToken, refreshToken, params, profile, done) {
async function (req, accessToken, refreshToken, params, profile, done) {
try {
const userInfoResponse = await fetch(provider.OAUTH_USERINFO_URL, {
headers: { 'Authorization': `Bearer ${accessToken}` }
@ -36,24 +36,24 @@ class PassportOAuth {
roles: []
};
if(hasNestedValue(userInfo,provider.OAUTH_ROLE_TEACHER_VALUE)) received_user.roles.push('teacher')
if(hasNestedValue(userInfo,provider.OAUTH_ROLE_STUDENT_VALUE)) received_user.roles.push('student')
if (hasNestedValue(userInfo, provider.OAUTH_ROLE_TEACHER_VALUE)) received_user.roles.push('teacher')
if (hasNestedValue(userInfo, provider.OAUTH_ROLE_STUDENT_VALUE)) received_user.roles.push('student')
const user_association = await authUserAssoc.find_user_association(self.auth_name,received_user.auth_id)
const user_association = await authUserAssoc.find_user_association(self.auth_name, received_user.auth_id)
let user_account
if(user_association){
if (user_association) {
user_account = await users.getById(user_association.user_id)
}
else {
let user_id = await users.getId(received_user.email)
if(user_id){
if (user_id) {
user_account = await users.getById(user_id);
} else {
received_user.password = users.generatePassword()
user_account = await self.passportjs.register(received_user)
}
await authUserAssoc.link(self.auth_name,received_user.auth_id,user_account._id)
await authUserAssoc.link(self.auth_name, received_user.auth_id, user_account._id)
}
user_account.name = received_user.name
@ -76,7 +76,7 @@ class PassportOAuth {
app.get(`${endpoint}/${name}`, (req, res, next) => {
passport.authenticate(name, {
scope: 'openid profile email offline_access'+ ` ${provider.OAUTH_ADD_SCOPE}`,
scope: 'openid profile email offline_access' + ` ${provider.OAUTH_ADD_SCOPE}`,
prompt: 'consent'
})(req, res, next);
});
@ -87,7 +87,7 @@ class PassportOAuth {
},
(req, res) => {
if (req.user) {
self.passportjs.authenticate(req.user,req,res)
self.passportjs.authenticate(req.user, req, res)
} else {
res.status(401).json({ error: "L'authentification a échoué" });
}

31
server/auth/modules/passport-providers/oidc.js
View file

@ -5,13 +5,13 @@ var { hasNestedValue } = require('../../../utils')
var jwt = require('../../../middleware/jwtToken')
class PassportOpenIDConnect {
constructor(passportjs,auth_name){
constructor(passportjs, auth_name) {
this.passportjs = passportjs
this.auth_name = auth_name
}
async getConfigFromConfigURL(name,provider){
try{
async getConfigFromConfigURL(name, provider) {
try {
const config = await fetch(provider.OIDC_CONFIG_URL)
return await config.json()
} catch (error) {
@ -19,10 +19,10 @@ class PassportOpenIDConnect {
}
}
async register(app, passport,endpoint, name, provider) {
async register(app, passport, endpoint, name, provider) {
const config = await this.getConfigFromConfigURL(name,provider)
const cb_url =`${process.env['BACKEND_URL']}${endpoint}/${name}/callback`
const config = await this.getConfigFromConfigURL(name, provider)
const cb_url = `${process.env['BACKEND_URL']}${endpoint}/${name}/callback`
const self = this
passport.use(name, new OpenIDConnectStrategy({
@ -37,7 +37,7 @@ class PassportOpenIDConnect {
scope: 'openid profile email ' + `${provider.OIDC_ADD_SCOPE}`,
},
// patch pour la librairie permet d'obtenir les groupes, PR en cours mais "morte" : https://github.com/jaredhanson/passport-openidconnect/pull/101
async function(req, issuer, profile, times, tok, done) {
async function (req, issuer, profile, times, tok, done) {
try {
const received_user = {
auth_id: profile.id,
@ -46,24 +46,25 @@ class PassportOpenIDConnect {
roles: []
};
if(hasNestedValue(profile,provider.OIDC_ROLE_TEACHER_VALUE)) received_user.roles.push('teacher')
if(hasNestedValue(profile,provider.OIDC_ROLE_STUDENT_VALUE)) received_user.roles.push('student')
const user_association = await authUserAssoc.find_user_association(self.auth_name,received_user.auth_id)
if (hasNestedValue(profile, provider.OIDC_ROLE_TEACHER_VALUE)) received_user.roles.push('teacher')
if (hasNestedValue(profile, provider.OIDC_ROLE_STUDENT_VALUE)) received_user.roles.push('student')
const user_association = await authUserAssoc.find_user_association(self.auth_name, received_user.auth_id)
let user_account
if(user_association){
if (user_association) {
user_account = await users.getById(user_association.user_id)
}
else {
let user_id = await users.getId(received_user.email)
if(user_id){
if (user_id) {
user_account = await users.getById(user_id);
} else {
received_user.password = users.generatePassword()
user_account = await self.passportjs.register(received_user)
}
await authUserAssoc.link(self.auth_name,received_user.auth_id,user_account._id)
await authUserAssoc.link(self.auth_name, received_user.auth_id, user_account._id)
}
user_account.name = received_user.name
@ -77,7 +78,7 @@ class PassportOpenIDConnect {
app.get(`${endpoint}/${name}`, (req, res, next) => {
passport.authenticate(name, {
scope: 'openid profile email offline_access'+ ` ${provider.OAUTH_ADD_SCOPE}`,
scope: 'openid profile email offline_access' + ` ${provider.OAUTH_ADD_SCOPE}`,
prompt: 'consent'
})(req, res, next);
});
@ -88,7 +89,7 @@ class PassportOpenIDConnect {
},
(req, res) => {
if (req.user) {
self.passportjs.authenticate(req.user,req,res)
self.passportjs.authenticate(req.user, req, res)
} else {
res.status(401).json({ error: "L'authentification a échoué" });
}

68
server/auth/modules/simpleauth.js
View file

@ -6,25 +6,26 @@ const AppError = require('../../middleware/AppError.js');
const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR } = require('../../constants/errorCodes');
const { name } = require('../../models/authProvider.js');
class SimpleAuth{
constructor(authmanager,settings){
class SimpleAuth {
constructor(authmanager, settings) {
this.authmanager = authmanager
this.providers = settings
this.endpoint = "/api/auth/simple-auth"
}
async registerAuth(expressapp){
try{
expressapp.post(`${this.endpoint}/register`, (req,res,next)=>this.register(this,req,res));
expressapp.post(`${this.endpoint}/login`, (req,res,next)=>this.authenticate(this,req,res));
expressapp.post(`${this.endpoint}/reset-password`, (req,res,next)=>this.resetPassword(this,req,res));
expressapp.post(`${this.endpoint}/change-password`, jwt.authenticate, (req,res,next)=>this.changePassword(this,req,res));
} catch(error){
async registerAuth(expressapp) {
try {
expressapp.post(`${this.endpoint}/register`, (req, res, next) => this.register(this, req, res));
expressapp.post(`${this.endpoint}/login`, (req, res, next) => this.authenticate(this, req, res));
expressapp.post(`${this.endpoint}/reset-password`, (req, res, next) => this.resetPassword(this, req, res));
expressapp.post(`${this.endpoint}/change-password`, jwt.authenticate, (req, res, next) => this.changePassword(this, req, res));
} catch (error) {
console.error(`La connexion ${name} de type ${provider.type} n'as pu être chargé.`)
}
}
async register(self,req, res) {
async register(self, req, res) {
try {
let userInfos = {
name: req.body.name,
email: req.body.email,
@ -32,26 +33,7 @@ class SimpleAuth{
roles: req.body.roles
}
let user = await self.authmanager.register(userInfos)
if(user) res.redirect("/")
else res.redirect("/login")
}
async authenticate(self,req, res, next) {
try {
const { email, password } = req.body;
if (!email || !password) {
throw new AppError(MISSING_REQUIRED_PARAMETER);
}
const user = await model.login(email, password);
if (!user) {
throw new AppError(LOGIN_CREDENTIALS_ERROR);
}
user.name = user.name ?? user.email
self.authmanager.login(user,req,res,next)
if (user) res.redirect("/login")
}
catch (error) {
return res.status(400).json({
@ -60,7 +42,29 @@ class SimpleAuth{
}
}
async resetPassword(self,req, res, next) {
async authenticate(self, req, res, next) {
try {
const { email, password } = req.body;
if (!email || !password) {
const error = new Error("Email or password is missing");
error.statusCode = 400;
throw error;
}
const user = await model.login(email, password);
await self.authmanager.login(user, req, res, next);
} catch (error) {
const statusCode = error.statusCode || 500;
const message = error.message || "An internal server error occurred";
console.error(error);
return res.status(statusCode).json({ message });
}
}
async resetPassword(self, req, res, next) {
try {
const { email } = req.body;
@ -85,7 +89,7 @@ class SimpleAuth{
}
}
async changePassword(self,req, res, next) {
async changePassword(self, req, res, next) {
try {
const { email, oldPassword, newPassword } = req.body;

4
server/middleware/jwtToken.js
View file

@ -7,8 +7,8 @@ dotenv.config();
class Token {
create(email, userId) {
return jwt.sign({ email, userId }, process.env.JWT_SECRET);
create(email, userId, roles) {
return jwt.sign({ email, userId, roles }, process.env.JWT_SECRET);
}
authenticate(req, res, next) {

14
server/models/users.js
View file

@ -64,24 +64,32 @@ class Users {
}
async login(email, password) {
try {
await db.connect();
const conn = db.getConnection();
const userCollection = conn.collection("users");
const user = await userCollection.findOne({ email: email });
if (!user) {
return false;
const error = new Error("User not found");
error.statusCode = 404;
throw error;
}
const passwordMatch = await this.verify(password, user.password);
if (!passwordMatch) {
return false;
const error = new Error("Password does not match");
error.statusCode = 401;
throw error;
}
return user;
} catch (error) {
console.error(error);
throw error;
}
}
async resetPassword(email) {