Skip to content

BCN-PT-VICTOR-CAMARENA #29

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
Victor-Camarena-Ballester wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BCN-PT-VICTOR-CAMARENA #29

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
18 changes: 18 additions & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true
},
"extends": "airbnb-base",
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018
},
"rules": {
}
}
34 changes: 32 additions & 2 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,60 @@
const createError = require('http-errors');
const express = require('express');
const path = require('path');
const cookieParser = require('cookie-parser');
const logger = require('morgan');
const mongoose = require('mongoose');
const session = require('express-session');
const MongoStore = require('connect-mongo')(session);
const flash = require('connect-flash');
const { notifications } = require('./middlewares');

const indexRouter = require('./routes/index');
const usersRouter = require('./routes/users');

const app = express();

mongoose.connect('mongodb://localhost/basic-auth', {
keepAlive: true,
useNewUrlParser: true,
reconnectTries: Number.MAX_VALUE
reconnectTries: Number.MAX_VALUE,
});


// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'hbs');


app.use(logger('dev'));
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));
app.use(
session({
store: new MongoStore({
mongooseConnection: mongoose.connection,
ttl: 24 * 60 * 60, // 1 day
}),
secret: 'basic-auth-phrase',
resave: true,
saveUninitialized: true,
cookie: {
maxAge: 24 * 60 * 60 * 1000,
},
}),
);

app.use(flash());

app.use((req, res, next) => {
app.locals.currentUser = req.session.currentUser;
next();
});
app.use(notifications(app));
app.use('/', indexRouter);
app.use('/users', usersRouter);


// -- 404 and error handler

Expand Down
58 changes: 58 additions & 0 deletions middlewares/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
const bcrypt = require('bcrypt');
const User = require('../models/User');

const checkFields = (req, res, next) => {
const { username, password } = req.body;

if (username === '' || password === '') {
req.flash('error', 'UserName and Password can\'t be empty!');
res.redirect('/create');
} else {
next();
}
};

const createUser = async (username, password) => {
bcrypt.hash(password, 10, async (err, hash) => {
return User.create({ username, hashedPassword: hash });
});
};

const LogIn = async (username, password, req, res) => {
const user = await User.findOne({ username });
if (user) {
if (bcrypt.compareSync(password, user.hashedPassword)) {
req.session.currentUser = user;
res.redirect('/users/admin');
} else {
req.flash('error', 'usuario o contraseña incorrectos');
res.redirect('login');
}
} else {
req.flash('error', 'usuario o contraseña incorrectos');
res.redirect('login');
}
};


const checkLoggin = (req, res, next) => {
if (req.session.currentUser) {
next();
} else {
req.flash('warning', 'Must be Logged to acces!');
res.redirect('/login');
}
};

const notifications = () => (req, res, next) => {
res.locals.errorMessages = req.flash('error');
res.locals.infoMessages = req.flash('info');
res.locals.dangerMessages = req.flash('danger');
res.locals.successMessages = req.flash('success');
res.locals.warningMessages = req.flash('warning');
next();
};

module.exports = {
checkFields, createUser, notifications, checkLoggin, LogIn,
};
20 changes: 20 additions & 0 deletions models/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const mongoose = require('mongoose');

const { Schema } = mongoose;

const userSchema = new Schema(
{
username: { type: String, required: true, unique: true },
hashedPassword: { type: String, required: true },
},
{
timestamps: {
createdAt: 'created_at',
updatedAt: 'updated_at',
},
},
);

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

module.exports = User;
9 changes: 9 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,22 @@
"start-dev": "nodemon ./bin/www"
},
"dependencies": {
"bcrypt": "^3.0.6",
"connect-flash": "^0.1.1",
"connect-mongo": "^3.0.0",
"cookie-parser": "~1.4.3",
"debug": "~2.6.9",
"express": "~4.16.0",
"express-session": "^1.16.2",
"hbs": "~4.0.1",
"http-errors": "~1.6.2",
"mongoose": "^5.4.12",
"morgan": "~1.9.0",
"nodemon": "^1.18.10"
},
"devDependencies": {
"eslint": "^6.3.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-plugin-import": "^2.18.2"
}
}
43 changes: 41 additions & 2 deletions routes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,48 @@
const express = require('express');
const User = require('../models/User');
const { checkFields, createUser, LogIn } = require('../middlewares');

const router = express.Router();

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

router.get('/create', (req, res) => {
res.render('create');
});

router.post('/create', checkFields, async (req, res) => {
const { username, password } = req.body;
try {
if (await User.findOne({ username })) {
// Ya exite, le devulevo un mensage
req.flash('info', 'User already exists');
res.redirect('/create');
} else {
// No existe. lo creo.
const user = await createUser(username, password);
req.session.currentUser = user;
req.flash('info', 'user created');
res.redirect('/users/admin');
}
} catch (error) {
req.flash('error', error.message);
res.redirect('/create');
}
});

router.get('/login', (req, res) => {
res.render('login');
});
router.post('/login', checkFields, async (req, res) => {
const { username, password } = req.body;
try {
LogIn(username, password, req, res);
} catch (error) {
req.flash('error', error.message);
res.redirect('/login');
}
});

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

const router = express.Router();

const { checkLoggin } = require('../middlewares');

router.use(checkLoggin);

router.get('/admin', (req, res) => {
res.render('users/admin');
});

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

module.exports = router;
15 changes: 15 additions & 0 deletions views/create.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<h2>Create a register and join us!</h2>
<div>


<form action="/create" method="post">
<label for="username">Username</label><br>
<input type="text" name="username" placeholder="Your username"><br />

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

<button type="submit">Sign In</button>
</form>

</div>
6 changes: 6 additions & 0 deletions views/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
<h1>{{title}}</h1>
<p>Welcome to {{title}}</p>
<div>
<div><a href="/create">Create Account</a></div>
<div><a href="/login">Go to LogIn</a></div>

<div><a href="/users/admin">Go to Admin</a></div>
</div>
15 changes: 13 additions & 2 deletions views/layout.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
<!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>
<body>

<body>
<a href="/">Home</a>
{{{body}}}

{{#if infoMessages}}
<p class="info">{{infoMessages}}</p>
{{/if}}
{{#if errorMessages }}
<p class="error">{{ errorMessages }}</p>
{{/if }}
{{#if warningMessages }}
<p class="warning">{{ warningMessages }}</p>
{{/if }}
<script src="/javascripts/script.js"></script>
</body>

</html>
15 changes: 15 additions & 0 deletions views/login.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<h2>Log in and share!!!!</h2>
<div>


<form action="/login" method="post">
<label for="username">Username</label><br>
<input type="text" name="username" placeholder="Your username"><br />

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

<button type="submit">login</button>
</form>

</div>
2 changes: 2 additions & 0 deletions views/users/admin.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h2>Welcome {{ currentUser.username }}</h2>
<a href="/users/logout">Logout</a>