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

centralise login/register methods

Browse source
This commit is contained in:
Gabriel Matte 2024-10-08 15:45:18 -04:00
parent 3d219d068f
commit 7edce8ba9e
6 changed files with 61 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,8 @@
const fs = require('fs');
const AuthConfig = require('../config/auth.js');
const jwt = require('../middleware/jwtToken.js');
const emailer = require('../config/email.js');
const model = require('../models/users.js');
class AuthManager{
constructor(expressapp,configs=null){
@ -39,18 +42,19 @@ class AuthManager{
}
}
async login(userInfos){
// TODO global user login method
console.log(userInfos)
async login(userInfo,req,res,next){
const tokenToSave = jwt.create(userInfo.email, userInfo._id);
res.redirect(`/oauth/callback?user=${tokenToSave}`);
console.info(`L'utilisateur '${userInfo.name}' vient de se connecter`)
}
async register(userInfos){
// TODO global user register method
console.log(userInfos)
}
async logout(){
// TODO global user logout method
if (!userInfos.email || !userInfos.password) {
throw new AppError(MISSING_REQUIRED_PARAMETER);
}
const user = await model.register(userInfos);
emailer.registerConfirmation(user.email)
return user
}
}

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

@ -39,22 +39,26 @@ class PassportOAuth {
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._id,received_user.auth_id)
const user_association = await authUserAssoc.find_user_association(self.auth_name,received_user.auth_id)
let user_account = null
let user_account
if(user_association){
user_account = await users.getById(user_association.user_id)
}
else {
let user_id = await users.getId(received_user.email)
user_account = user_id ? await users.getById(user_id) : await users.register(received_user.email,"")
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)
}
user_account.name = received_user.name
user_account.roles = received_user.roles
await users.editUser(user_account)
self.passportjs.authenticate(user_account)
// Store the tokens in the session
req.session.oauth2Tokens = {
@ -83,15 +87,7 @@ class PassportOAuth {
},
(req, res) => {
if (req.user) {
// res.json(req.user)
//const redirectUrl = `http://your-frontend-url.com/oauth/callback?user=${encodeURIComponent(req.user)}`;
//res.redirect(redirectUrl);
const tokenToSave = jwt.create(req.user.email, req.user._id);
res.redirect('/oauth/callback?user=' + tokenToSave);
console.info(`L'utilisateur '${req.user.name}' vient de se connecter`)
self.passportjs.authenticate(req.user,req,res)
} else {
res.status(401).json({ error: "L'authentification a échoué" });
}

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

@ -49,22 +49,26 @@ class PassportOpenIDConnect {
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._id,received_user.auth_id)
const user_association = await authUserAssoc.find_user_association(self.auth_name,received_user.auth_id)
let user_account = null
let user_account
if(user_association){
user_account = await users.getById(user_association.user_id)
}
else {
let user_id = await users.getId(received_user.email)
user_account = user_id ? await users.getById(user_id) : await users.register(received_user.email,"")
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)
}
user_account.name = received_user.name
user_account.roles = received_user.roles
await users.editUser(user_account)
self.passportjs.authenticate(user_account)
return done(null, user_account);
} catch (error) {
@ -84,12 +88,7 @@ class PassportOpenIDConnect {
},
(req, res) => {
if (req.user) {
// res.json(req.user)
const tokenToSave = jwt.create(req.user.email, req.user._id);
res.redirect('/oauth/callback?user=' + tokenToSave);
console.info(`L'utilisateur '${req.user.name}' vient de se connecter`)
self.passportjs.authenticate(req.user,req,res)
} else {
res.status(401).json({ error: "L'authentification a échoué" });
}

9
server/auth/modules/passportjs.js
View file

@ -1,4 +1,3 @@
const fs = require('fs');
var passport = require('passport')
var authprovider = require('../../models/authProvider')
@ -51,12 +50,12 @@ class PassportJs{
}
register(userinfos){
return this.authmanager.register(userinfos)
register(userInfos){
return this.authmanager.register(userInfos)
}
authenticate(userinfos){
return this.authmanager.login(userinfos)
authenticate(userInfo,req,res,next){
return this.authmanager.login(userInfo,req,res,next)
}
}

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

@ -1,53 +1,41 @@
var authprovider = require('../../models/authProvider.js')
var users = require('../../app.js')
const jwt = require('../../middleware/jwtToken.js');
const emailer = require('../../config/email.js');
const model = require('../../models/users.js');
const AppError = require('../../middleware/AppError.js');
const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR, DELETE_USER_ERROR } = require('../../constants/errorCodes');
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){
this.authmanager = authmanager
this.providers = settings
this.endpoint = "/api/users"
this.endpoint = "/api/auth/simple-auth"
}
async registerAuth(expressapp){
try{
expressapp.post(`${this.endpoint}/register`, this.register);
expressapp.post(`${this.endpoint}/login`, this.authenticate);
expressapp.post(`${this.endpoint}/reset-password`, this.resetPassword);
expressapp.post(`${this.endpoint}/change-password`, jwt.authenticate, this.changePassword);
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(req, res, next) {
try {
const { email, password } = req.body;
if (!email || !password) {
throw new AppError(MISSING_REQUIRED_PARAMETER);
}
await model.register(email, password);
emailer.registerConfirmation(email)
return res.status(200).json({
message: 'Utilisateur créé avec succès.'
});
}
catch (error) {
return next(error);
async register(self,req, res) {
let userInfos = {
name: req.body.email,
email: req.body.email,
password: req.body.password,
}
let user = await self.authmanager.register(userInfos)
if(user) res.redirect("/")
else res.redirect("/login")
}
async authenticate(req, res, next) {
async authenticate(self,req, res, next) {
try {
const { email, password } = req.body;
@ -60,21 +48,16 @@ class SimpleAuth{
if (!user) {
throw new AppError(LOGIN_CREDENTIALS_ERROR);
}
const token = jwt.create(user.email, user._id);
return res.status(200).json({
token: token,
id: user.email
});
user.name = user.name ?? user.email
self.authmanager.login(user,req,res,next)
}
catch (error) {
return next(error);
}
}
async resetPassword(req, res, next) {
async resetPassword(self,req, res, next) {
try {
const { email } = req.body;
@ -99,7 +82,7 @@ class SimpleAuth{
}
}
async changePassword(req, res, next) {
async changePassword(self,req, res, next) {
try {
const { email, oldPassword, newPassword } = req.body;

9
server/models/users.js
View file

@ -18,21 +18,22 @@ class Users {
return await bcrypt.compare(password, hash);
}
async register(email, password) {
async register(userInfos) {
await db.connect();
const conn = db.getConnection();
const userCollection = conn.collection("users");
const existingUser = await userCollection.findOne({ email: email });
const existingUser = await userCollection.findOne({ email: userInfos.email });
if (existingUser) {
throw new AppError(USER_ALREADY_EXISTS);
}
const newUser = {
email: email,
password: await this.hashPassword(password),
name: userInfos.name ?? userInfos.email,
email: userInfos.email,
password: await this.hashPassword(userInfos.password),
created_at: new Date(),
};