Crypteam
/
Cryptid
4
0
Fork 0
Code Issues 10 Pull Requests Packages Projects 9 Releases Wiki Activity

Gestion et affichage des erreurs d'inscription, redirection login apr inscr

Browse Source
pull/81/head
Baptiste MARCEL 1 year ago
parent 9241eb15d8
commit c0c6c21e8f
10 changed files with 307 additions and 86 deletions
Show Stats Download Patch File Download Diff File

59
cryptide_project/package-lock.json generated
Unescape View File

@ -21,6 +21,7 @@
"bootstrap": "^5.3.2",
"cors": "^2.8.5",
"express": "^4.18.2",
"express-session": "^1.17.3",
"lodash": "^4.17.21",
"mysql": "^2.18.1",
"react": "^18.2.0",
@ -8272,6 +8273,45 @@
"node": ">= 0.10.0"
}
},
"node_modules/express-session": {
"version": "1.17.3",
"resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz",
"integrity": "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==",
"dependencies": {
"cookie": "0.4.2",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "~2.0.0",
"on-headers": "~1.0.2",
"parseurl": "~1.3.3",
"safe-buffer": "5.2.1",
"uid-safe": "~2.1.5"
},
"engines": {
"node": ">= 0.8.0"
}
},
"node_modules/express-session/node_modules/cookie": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
"integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
"engines": {
"node": ">= 0.6"
}
},
"node_modules/express-session/node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/express-session/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"node_modules/express/node_modules/array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@ -14798,6 +14838,14 @@
"performance-now": "^2.1.0"
}
},
"node_modules/random-bytes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
"integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
"engines": {
"node": ">= 0.8"
}
},
"node_modules/randombytes": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@ -17133,6 +17181,17 @@
"node": ">=14.17"
}
},
"node_modules/uid-safe": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
"integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
"dependencies": {
"random-bytes": "~1.0.0"
},
"engines": {
"node": ">= 0.8"
}
},
"node_modules/unbox-primitive": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",

1
cryptide_project/package.json
Unescape View File

@ -15,6 +15,7 @@
"bootstrap": "^5.3.2",
"cors": "^2.8.5",
"express": "^4.18.2",
"express-session": "^1.17.3",
"lodash": "^4.17.21",
"mysql": "^2.18.1",
"react": "^18.2.0",

24
cryptide_project/src/Pages/LoginForm.tsx
Unescape View File

@ -1,18 +1,38 @@
import React, { Component } from 'react';
import { AiOutlineSend } from 'react-icons/ai';
import AuthService from '../services/AuthService';
import '../Style/Global.css';
export default class Login extends Component {
handleSubmit = async (event: any) => {
event.preventDefault();
try{
const data = {
pseudo: event.target.pseudo.value,
password: event.target.password.value,
remember: event.target.remember.value
};
const result = await AuthService.signIn(data);
console.log(result);
alert('Connexion réussie !');
}
catch(error){
console.error(error);
}
};
render() {
return (
<div className="form-container">
<form>
<form onSubmit={this.handleSubmit}>
<br/>
<h3>Log In</h3>
<div className="mb-3">
<label>Pseudo</label>
<input
type="pseudo"
name='pseudo'
className="form-control"
placeholder="Entrez votre pseudo ici"
/>
@ -21,6 +41,7 @@ export default class Login extends Component {
<label>Password</label>
<input
type="password"
name='password'
className="form-control"
placeholder="Entrez votre mot de passe ici"
/>
@ -29,6 +50,7 @@ export default class Login extends Component {
<div className="custom-control custom-checkbox">
<input
type="checkbox"
name='remember'
className="custom-control-input"
id="customCheck1"
/>

67
cryptide_project/src/Pages/SignUpForm.tsx
Unescape View File

@ -1,35 +1,54 @@
import React, { Component } from 'react';
import React, { useState, useEffect } from 'react';
import { AiOutlineSend } from 'react-icons/ai';
import { useNavigate } from 'react-router-dom'; // Use useNavigate instead of useHistory
import AuthService from '../services/AuthService';
import '../Style/Global.css';
export default class SignUp extends Component {
handleSubmit = async (event: any) => {
const SignUp = () => {
const navigate = useNavigate(); // Use useNavigate instead of useHistory
const [error, setError] = useState<string | null>(null);
const [showConfirmation, setShowConfirmation] = useState(false);
const handleSubmit = async (event: React.FormEvent) => {
event.preventDefault();
try {
const data = {
pseudo: event.target.pseudo.value,
password: event.target.password.value,
Cpassword: event.target.Cpassword.value
pseudo: (event.target as any).pseudo.value,
password: (event.target as any).password.value,
Cpassword: (event.target as any).Cpassword.value,
};
const isValid = await AuthService.validateSignUp(data);
const validation = await AuthService.validateSignUp(data);
if (!validation.valid) {
setError(validation.error);
} else {
setError(null);
if(isValid){
const result = await AuthService.signUp(data);
console.log(result);
alert('Inscription réussie !');
}
// console.log(result);
setShowConfirmation(true);
setTimeout(() => {
navigate('/login'); // 3 secondes avant de rediriger vers la page de connexion
}, 3000);
}
catch(error){
console.error(error);
} catch (error: any) {
setError(error.message);
}
};
render() {
useEffect(() => {
return () => {
setShowConfirmation(false);
};
}, []);
return (
<div className="form-container">
<form onSubmit={this.handleSubmit}>
<form onSubmit={handleSubmit}>
<br/>
<h3>Sign Up</h3>
<div className="mb-3">
@ -40,7 +59,6 @@ export default class SignUp extends Component {
name="pseudo"
className="form-control"
placeholder="Entrez votre pseudo ici"
required
/>
</div>
<div className="mb-3">
@ -74,7 +92,20 @@ export default class SignUp extends Component {
Vous avez déjà un <a href="/login">compte</a> ?
</p>
</form>
{error && (
<div className="alert alert-danger" role="alert">
{error}
</div>
)}
{showConfirmation && (
<div className="alert alert-success" role="alert">
Inscription réussie ! Vous serez redirigé vers la page de connexion dans 3 secondes.
</div>
)}
</div>
);
}
}
};
export default SignUp;

43
cryptide_project/src/server/controllers/AuthController.js
Unescape View File

@ -1,5 +1,6 @@
const UserService = require('../services/UserService');
const DatabaseService = require('../services/DatabaseService');
const bcrypt = require('bcrypt');
class AuthController {
static async signUp(req, res) {
@ -8,8 +9,6 @@ class AuthController {
try {
await databaseService.connect();
// Validation côté serveur (vous pouvez utiliser express-validator ici)
// Vérifier que le pseudo n'est pas déjà utilisé
const pseudo = req.body.pseudo;
const verifUser = await databaseService.getUserByPseudo(pseudo);
if (verifUser) {
@ -33,6 +32,46 @@ class AuthController {
await databaseService.disconnect();
}
}
static async signIn(req, res) {
const databaseService = new DatabaseService();
try{
await databaseService.connect();
// Vérifier que le pseudo existe
const pseudo = req.body.pseudo;
const user = await databaseService.getUserByPseudo(pseudo);
if (!user) {
res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
return;
}
// Vérifier que le mot de passe est correct
const password = req.body.password;
const validPassword = await bcrypt.compare(password, user.password);
if (!validPassword) {
res.status(400).json({ error: 'Le mot de passe est incorrect.' });
return;
}
// Stocker l'utilisateur dans la session
if(!req.session.user && req.body.remember){
req.session.user = user;
}
// Envoyer une réponse réussie
res.status(200).json({ message: 'Connexion réussie', user: user });
}
catch(error){
// Gérer les erreurs
console.error(error);
res.status(500).json({ error: 'Erreur lors de la connexion.' });
}
finally{
await databaseService.disconnect();
}
}
}
module.exports = AuthController;

1
cryptide_project/src/server/routes/AuthRoutes.js
Unescape View File

@ -3,5 +3,6 @@ const router = express.Router();
const AuthController = require('../controllers/AuthController');
router.post('/signup', AuthController.signUp);
router.post('/signin', AuthController.signIn);
module.exports = router;

19
cryptide_project/src/server/server.js
Unescape View File

@ -1,17 +1,28 @@
const express = require('express');
const session = require('express-session');
const cors = require('cors');
const bodyParser = require('body-parser');
const crypto = require('crypto');
const authRoutes = require('./routes/authRoutes');
const DatabaseService = require('./services/DatabaseService');
const app = express();
const port = 3000;
// Middleware CORS
app.use(cors());
// Middleware
app.use(cors()); // Autoriser les requêtes cross-origin
app.use(bodyParser.json()); // Parser le body des requêtes en JSON
// Middleware pour traiter le corps des requêtes en JSON
app.use(bodyParser.json());
// Session
const secret = crypto.randomBytes(32).toString('hex');
app.use(session({
secret: secret,
resave: false,
saveUninitialized: true,
cookie: { secure: process.env.NODE_ENV === 'production' ? true : false,
maxAge: 60 * 60 * 1000
}
}));
// Middleware pour les routes d'authentification
app.use('/auth', authRoutes);

28
cryptide_project/src/services/AuthService.tsx
Unescape View File

@ -1,8 +1,9 @@
import e from 'express';
import VerificationService from './VerificationService';
class AuthService{
// Méthode pour vérifier les données de connexion
static async validateSignUp(data: any): Promise<boolean>{
static async validateSignUp(data: any): Promise<{valid: boolean, error: string}> {
return VerificationService.validateSignUpData(data);
}
@ -20,7 +21,30 @@ class AuthService{
const result = await response.json();
return result;
} else {
throw new Error('Échec de l\'inscription.');
const errorResponse = await response.json();
throw new Error(errorResponse.error);
}
} catch (error) {
console.error(error);
throw error;
}
}
static async signIn(data: any) {
try {
const response = await fetch('http://localhost:3000/auth/signin', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(data),
});
if (response.ok) {
const result = await response.json();
return result;
} else {
throw new Error('Échec de la connexion.');
}
} catch (error) {
console.error(error);

18
cryptide_project/src/services/VerificationService.tsx
Unescape View File

@ -1,16 +1,18 @@
class ValidationService {
public static validateSignUpData(data: any): boolean {
public static validateSignUpData(data: any): {valid: boolean, error: string} {
if(!data.pseudo || !data.password || !data.Cpassword) {
console.error('Veuillez remplir tous les champs.');
return false;
return {valid: false, error: 'Veuillez remplir tous les champs.'};
}
// if(data.password !== data.Cpassword) {
// console.error('Les mots de passe ne correspondent pas.');
// return false;
// }
if(data.password.length < 8) {
return {valid: false, error: 'Le mot de passe doit contenir au moins 8 caractères.'};
}
if(data.password !== data.Cpassword) {
return {valid: false, error: 'Les mots de passe ne correspondent pas.'};
}
return true;
return {valid: true, error: ''};
}
}

33
cryptide_project/yarn.lock
Unescape View File

@ -3704,6 +3704,11 @@ cookie-signature@1.0.6:
resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
cookie@0.4.2:
version "0.4.2"
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
cookie@0.5.0:
version "0.5.0"
resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
@ -4109,7 +4114,7 @@ depd@~1.1.2:
resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
depd@2.0.0:
depd@~2.0.0, depd@2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@ -4871,6 +4876,20 @@ expect@^29.0.0:
jest-message-util "^29.7.0"
jest-util "^29.7.0"
express-session@^1.17.3:
version "1.17.3"
resolved "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz"
integrity sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==
dependencies:
cookie "0.4.2"
cookie-signature "1.0.6"
debug "2.6.9"
depd "~2.0.0"
on-headers "~1.0.2"
parseurl "~1.3.3"
safe-buffer "5.2.1"
uid-safe "~2.1.5"
express@^4.17.3, express@^4.18.2:
version "4.18.2"
resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
@ -8236,6 +8255,11 @@ raf@^3.4.1:
dependencies:
performance-now "^2.1.0"
random-bytes@~1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"
integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==
randombytes@^2.1.0:
version "2.1.0"
resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
@ -9722,6 +9746,13 @@ typedarray-to-buffer@^3.1.5:
resolved "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz"
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
uid-safe@~2.1.5:
version "2.1.5"
resolved "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"
integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==
dependencies:
random-bytes "~1.0.0"
unbox-primitive@^1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"

Write Preview
Loading…
Cancel
Save