Skip to content

[MAD-PT-WD092023]Luca Tobiello #2118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HisokaHX wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MAD-PT-WD092023]Luca Tobiello #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PORT=3000
PORT=3001
9 changes: 9 additions & 0 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ const capitalized = string => string[0].toUpperCase() + string.slice(1).toLowerC

app.locals.title = `${capitalized(projectName)}- Generated with Ironlauncher`;

hbs.registerPartials(__dirname + "/views/partials");

const { sessionConfig } = require("./config/session.config");
app.use(sessionConfig);
app.use((req, res, next) => {
res.locals.currentUser = req.session.currentUser;
next();
});

// 👇 Start handling routes here
const index = require('./routes/index');
app.use('/', index);
Expand Down
21 changes: 21 additions & 0 deletions config/session.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const User = require("../models/User.model");
const expressSession = require("express-session");
const MongoStore = require("connect-mongo");
const mongoose = require("mongoose");

const MAX_AGE = 7;

module.exports.sessionConfig = expressSession({
secret: process.env.COOKIE_SECRET || "super-secret",
resave: false,
saveUninitialized: false,
cookie: {
secure: false,
httpOnly: true,
maxAge: 24 * 3600 * 1000 * MAX_AGE,
},
store: new MongoStore({
mongoUrl: mongoose.connection._connectionString,
ttl: 24 * 3600 * MAX_AGE,
}),
});
101 changes: 101 additions & 0 deletions controllers/users.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
const User = require("../models/User.model");
const mongoose = require("mongoose");

module.exports.register = (req, res, next) => {
res.render("users/register");
};

module.exports.doRegister = (req, res, next) => {
const { email } = req.body;

User.findOne({ email }).then((dbUser) => {
if (dbUser) {
res.render("users/register", {
user: {
email,
},
errors: {
email: "Este email ya esta en uso!",
},
});
} else {

User.create(req.body)
.then(() => {


res.redirect("/login");
})
.catch((err) => {
console.error("Error al crear usuario:", err);

if (err instanceof mongoose.Error.ValidationError) {
res.render("users/register", {
user: {
email,
},
errors: err.errors, // { EMAIL: 'lo que sea', PASSWOR: ''}
});
} else {
next(err);
}
});
}
});
};

module.exports.login = (req, res, next) => {
res.render("users/login", { errors: false });
};

module.exports.profile = (req, res, next) => {
res.render("users/profile");
}

module.exports.player = (req, res, next) => {
res.render("users/listPlayer");
}

module.exports.doLogin = (req, res, next) => {
const { email, password } = req.body;

const renderWithErrors = (msg) => {
res.render('users/login', {
email,
errors: {
msg: msg || 'Email or password are incorrect',
},
});
};

if (!email || !password) {
renderWithErrors();
} else {
User.findOne({ email })
.then((dbUser) => {
if (!dbUser) {
renderWithErrors();
} else {
dbUser
.checkPassword(password)
.then((match) => {
if (!match) {
renderWithErrors();
} else {
req.session.currentUser = dbUser;
res.redirect('/profile');

}
})
.catch((err) => next(err));
}
})
.catch((err) => next(err));
}
};

module.exports.logout = (req, res, next) => {
req.session.destroy();
res.clearCookie('connect.sid');
res.redirect('/login');
};
2 changes: 2 additions & 0 deletions db/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// https://www.npmjs.com/package/mongoose
const mongoose = require("mongoose");


mongoose.set('strictQuery', false);
// ℹ️ Sets the MongoDB URI for our app to have access to it.
// If no env has been set, we dynamically set it to whatever the folder name was upon the creation of the app

Expand Down
25 changes: 25 additions & 0 deletions middlewares/auth.middlewares.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports.isAuthenticated = (req, res, next) => {
if (req.session.currentUser) {
next();
} else {
res.redirect("/login");
}
};

module.exports.isNotAuthenticated = (req, res, next) => {
if (!req.session.currentUser) {
next()
} else {
res.redirect("/profile");
}
};

module.exports.isAdmin = (req, res, next) => {
if (req.currentUser.isAdmin) {
next()
} else {
res.render("error", {
error: "you aren't admin"
});
}
};
38 changes: 33 additions & 5 deletions models/User.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,42 @@
const { Schema, model } = require("mongoose");
const mongoose = require("mongoose");
const bcrypt = require("bcryptjs");

const SALT_WORK_FACTOR = 10;
const EMAIL_PATTERN = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;

// TODO: Please make sure you edit the user model to whatever makes sense in this case
const userSchema = new Schema({
username: {
const userSchema = mongoose.Schema({
email: {
type: String,
unique: true
unique: true,
required: true,
},
password: String
password: {
type: String,
required: true,
minLength: 3,
}
});

const User = model("User", userSchema);
userSchema.pre("save", function (next) {
if (this.isModified("password")) {
bcrypt
.hash(this.password, SALT_WORK_FACTOR)
.then((hash) => {
this.password = hash;
next();
})
.catch((error) => next(error));
} else {
next();
}
});

userSchema.methods.checkPassword = function (passwordToCheck) {
return bcrypt.compare(passwordToCheck, this.password);
};

const User = mongoose.model("User", userSchema);

module.exports = User;
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
"dev": "nodemon server.js"
},
"dependencies": {
"bcryptjs": "^2.4.3",
"connect-mongo": "^5.1.0",
"cookie-parser": "^1.4.5",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"express-session": "^1.17.3",
"hbs": "^4.1.1",
"mongoose": "^6.1.2",
"morgan": "^1.10.0",
Expand Down
16 changes: 15 additions & 1 deletion routes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
const router = require("express").Router();
const usersController = require("../controllers/users.controller");
const authMiddleware = require("../middlewares/auth.middlewares");


/* GET home page */
router.get("/", (req, res, next) => {
res.render("index");
});

module.exports = router;
router.get("/register", authMiddleware.isNotAuthenticated, usersController.register);
router.post("/register", authMiddleware.isNotAuthenticated, usersController.doRegister);
router.get("/login", authMiddleware.isNotAuthenticated, usersController.login);
router.post("/login", authMiddleware.isNotAuthenticated, usersController.doLogin);
router.get("/logout", authMiddleware.isAuthenticated, usersController.logout);
router.get("/listPlayer", authMiddleware.isAuthenticated, usersController.player);


router.get("/profile", authMiddleware.isAuthenticated, usersController.profile);


module.exports = router;
26 changes: 15 additions & 11 deletions views/layout.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>{{title}}</title>
<link rel="stylesheet" href="/stylesheets/style.css" />
</head>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>{{title}}</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<link rel="stylesheet" href="/stylesheets/style.css" />
</head>

<body>
<body>
{{> navbar}}

<div class="container mt-6">
{{{body}}}

<script src="/js/script.js"></script>
</body>
</div>
<script src="/js/script.js"></script>
</body>

</html>
44 changes: 44 additions & 0 deletions views/partials/navbar.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="/">Mi Sitio Web</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<button class="navbar-toggler d-flex align-items-center" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon {{#if currentUser}}me-3 {{/if}}"></span>
{{#if currentUser}}
<div>
Hola,
{{currentUser.email}}
</div>
{{/if}}
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
{{#if currentUser}}
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/profile">Perfil</a>
</li>
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/listPlayer">Listado de futbolistas</a>
</li>
<li class="nav-item">
<li class="nav-item">
<a class="nav-link active text-danger" aria-current="page" href="/logout">Logout</a>
</li>
{{else}}
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/register">Register</a>
</li>
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/login">Login</a>
</li>
{{/if}}
</ul>
</div>
</div>

</nav>
20 changes: 20 additions & 0 deletions views/users/login.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<div id="form">
<h2>login</h2>
<form action="/login" method="POST">

<label> Username
<input type="text" name="username" placeholder="ironhacker" />
</label>

<label> Email
<input type="email" name="email" placeholder="rockstar@ironhack.com" />
</label>

<label> Password
<input type="password" name="password" placeholder="********" />
</label>

<button type="submit">Create account</button>

</form>
</div>
4 changes: 4 additions & 0 deletions views/users/profile.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h1>User's profile</h1>

<h2>Username: {{user.username}}</h2>
<h2>Email: {{user.email}}</h2>
Loading