theoludwig/FunctionProject
Archived
1
1
Fork 0
Code Pull Requests Actions Releases Activity

frontend: Page d'inscription + Hotfix backend

Browse Source
This commit is contained in:
Divlo
2020-03-25 18:22:03 +01:00
parent 2239df70b3
commit 7d49422108
11 changed files with 160 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/controllers/users.js
View File

@@ -10,7 +10,7 @@ const { EMAIL_INFO, HOST } = require('../assets/config/config');
const { signupEmail } = require('../assets/config/emails');
const Users = require('../models/users');
exports.signup = async (req, res, next) => {
exports.register = async (req, res, next) => {
const { name, email, password } = req.body;
const errors = validationResult(req);
if (!errors.isEmpty()) {
@@ -47,7 +47,7 @@ exports.login = async (req, res, next) => {
const token = jwt.sign({
email: user.email, userId: user.id
}, JWT_SECRET, { expiresIn: '1h' });
return res.status(200).json({ token, id: user.id, name: user.name, email: user.email, logo: user.logo, isAdmin: user.isAdmin, createdAt: user.createdAt });
return res.status(200).json({ token, id: user.id, name: user.name, email: user.email, biography: user.biography, logo: user.logo, isPublicEmail: user.isPublicEmail, isAdmin: user.isAdmin, createdAt: user.createdAt });
} catch (error) {
console.log(error);
errorHandling(next, serverError);

6
api/routes/users.js
View File

@@ -9,7 +9,7 @@ const UsersRouter = Router();
UsersRouter.post('/login', usersController.login);
// Permet de s'inscrire
UsersRouter.post('/signup', [
UsersRouter.post('/register', [
body('email')
.isEmail()
.withMessage("Veuillez rentré une adresse mail valide.")
@@ -31,7 +31,7 @@ UsersRouter.post('/signup', [
.trim()
.not()
.isEmpty()
.withMessage("Votre nom ne peut pas être vide.")
.withMessage("Vous devez avoir un nom (ou pseudo).")
.isAlphanumeric()
.withMessage("Votre nom ne peut contenir que des lettres ou/et des nombres.")
.custom((async (name) => {
@@ -44,7 +44,7 @@ UsersRouter.post('/signup', [
return console.log(error);
}
}))
], usersController.signup);
], usersController.register);
// Confirme l'inscription
UsersRouter.get('/confirm-email/:tempToken', usersController.confirmEmail);