Skip to content

done #2123

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
Jukeheim wants to merge 2 commits into
base: master
Choose a base branch
from
Open

done #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ae2095
not done
Nov 7, 2023
405b062
done
Apr 15, 2024
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
3 changes: 2 additions & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
PORT=3000
PORT=3000
SESS_SECRET=supersecreto
7 changes: 7 additions & 0 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const app = express();

// ℹ️ This function is getting exported from the config folder. It runs most middlewares
require('./config')(app);
require('./config/session.config')(app)

// default value for title local
const projectName = 'lab-express-basic-auth';
Expand All @@ -28,6 +29,12 @@ app.locals.title = `${capitalized(projectName)}- Generated with Ironlauncher`;
const index = require('./routes/index');
app.use('/', index);

const authRoutes = require('./routes/auth.routes')
app.use('/', authRoutes)

const userRoutes = require("./routes/user.routes")
app.use("/", userRoutes)

// ❗ To handle errors. Routes that don't exist or errors that you handle in specific routes
require('./error-handling')(app);

Expand Down
25 changes: 25 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,25 @@
const session = require('express-session');
const MongoStore = require('connect-mongo');
const mongoose = require('mongoose');

module.exports = app => {

app.set('trust proxy', 1);

app.use(
session({
secret: process.env.SESS_SECRET,
resave: true,
saveUninitialized: false,
cookie: {
sameSite: process.env.NODE_ENV === 'production' ? 'none' : 'lax',
secure: process.env.NODE_ENV === 'production',
httpOnly: true,
maxAge: 1000
},
store: MongoStore.create({
mongoUrl: process.env.MONGODB_URI || "mongodb://127.0.0.1:27017/lab-express-basic-auth"
})
})
);
};
2 changes: 1 addition & 1 deletion db/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const mongoose = require("mongoose");
// If no env has been set, we dynamically set it to whatever the folder name was upon the creation of the app

const MONGO_URI = process.env.MONGODB_URI || "mongodb://127.0.0.1:27017/lab-express-basic-auth";

// mongodb://0.0.0.0:27017
mongoose
.connect(MONGO_URI)
.then((x) => {
Expand Down
25 changes: 25 additions & 0 deletions middleware/route-guard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
const { models } = require("mongoose")

const isLoggedIn = (req, res, next) => {
if (req.session.currentUser) {
next()
}
else {
res.redirect('/login')
}
}


const isLoggedOut = (req, res, next) => {
if (!req.session.currentUser) {
next()
}
else {
res.redirect('/')
}
}

module.exports = {
isLoggedIn,
isLoggedOut
}
8 changes: 7 additions & 1 deletion models/User.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
const { Schema, model } = require("mongoose");


// TODO: Please make sure you edit the user model to whatever makes sense in this case
const userSchema = new Schema({
username: {
type: String,
trim: true,
required: [true, 'Username Required'],
unique: true
},
password: String
password: {
type: String,
required: [true, 'No password inserted']
}
});

const User = model("User", userSchema);
Expand Down
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
"private": true,
"scripts": {
"start": "node server.js",
"dev": "nodemon server.js"
"dev": "nodemon server.js -e js, hbs"
},
"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.18.0",
"hbs": "^4.1.1",
"mongoose": "^6.1.2",
"morgan": "^1.10.0",
Expand Down
62 changes: 62 additions & 0 deletions routes/auth.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
const express = require('express');
const router = express.Router();
const bcrypt = require('bcryptjs');
const User = require('./../models/User.model');
const saltRounds = 10;
const { isLoggedOut } = require('../middleware/route-guard');

router.get('/register', isLoggedOut, (req, res) => {
res.render('auth/signup');
});

router.post('/register', isLoggedOut, (req, res, next) => {
const { username, plainPassword } = req.body;

bcrypt.genSalt(saltRounds)
.then(salt => bcrypt.hash(plainPassword, salt))
.then(passwordHash => User.create({ username, password: passwordHash }))
.then(() => res.redirect('/login'))
.catch(err => next(err));
});

router.get('/login', isLoggedOut, (req, res, next) => {
res.render('auth/login');
});

router.post('/login', isLoggedOut, (req, res, next) => {
const { username, password } = req.body;

if (!username || !password) {
res.render('auth/login', { errorMessage: 'Username and password are required' });
return;
}

User
.findOne({ username })
.then(foundUser => {
if (!foundUser) {
res.render('auth/login', { errorMessage: 'Username not registered' });
return;
}

bcrypt.compare(password, foundUser.password)
.then(isPasswordValid => {
if (!isPasswordValid) {
res.render('auth/login', { errorMessage: 'Invalid password' });
return;
}

req.session.currentUser = foundUser;
res.redirect('/');
});
})
.catch(err => next(err));
});

router.get('/logout', (req, res) => {
req.session.destroy(() => {
res.redirect('/');
});
});

module.exports = router;
11 changes: 11 additions & 0 deletions routes/user.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const express = require('express')
const router = express.Router()

const { isLoggedIn } = require('../middleware/route-guard')

router.get('/profile', isLoggedIn, (req, res) =>{
res.render('user/profile', { user: req.session.currentUser})

})

module.exports = router
26 changes: 26 additions & 0 deletions views/auth/login.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-6">
<h1>Access</h1>
<hr>
<form action="/login" method="POST">
<div class="mb-3">
<label for="username" class="form-label">Username</label>
<input type="email" class="form-control" id="username" name="username">
</div>
<div class="mb-3">
<label for="password" class="form-label">Password</label>
<input type="password" class="form-control" id="password" name="password">
</div>

{{#if errorMessage}}
<p id="error">{{errorMessage}}</p>
{{/if}}

<div class="d-grid">
<button type="submit" class="btn btn-dark">Acceder</button>
</div>
</form>
</div>
</div>
</div>
23 changes: 23 additions & 0 deletions views/auth/signup.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-6">
<h1>Register</h1>
<hr>
<form action="/register" method="POST">
<div class="mb-3">
<label for="username" class="form-label">Username</label>
<input type="text" class="form-control" id="username" name="username">
<div class="form-text">No trolling pls!</div>
</div>
<div class="mb-3">
<label for="password" class="form-label">Password</label>
<input type="password" class="form-control" id="password" name="plainPassword">
<div class="form-text">Mínimo 4 caracteres.</div>
</div>
<div class="d-grid">
<button type="submit" class="btn btn-dark">Register</button>
</div>
</form>
</div>
</div>
</div
58 changes: 46 additions & 12 deletions views/layout.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,53 @@
<!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>{{appTitle}}</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>

{{{body}}}
<nav class="navbar navbar-expand-lg bg-body-tertiary bg-dark border-bottom border-body mb-5" data-bs-theme="dark">
<div class="container-fluid">
<a class="navbar-brand" href="#">{{appTitle}}</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavAltMarkup"
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="/libros/listado">List</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/libros/crear">Create</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Auth
</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="/register">Register</a></li>
<li><a class="dropdown-item" href="/login">Login</a></li>
<li><a class="dropdown-item" href="/logout">Logout</a></li>
</ul>
</li>
</ul>
</div>
</div>
</nav>

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

</html>
{{{body}}}

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>

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

</html