Skip to content

BCN-WDFT-Llorenç Martinez #11

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

BCN-WDFT-Llorenç Martinez #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b63305b
configOK
LlurensMartinez Mar 4, 2019
5fd8ae3
falla flash
LlurensMartinez Mar 4, 2019
e211428
todo OK
LlurensMartinez Mar 5, 2019
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
22 changes: 22 additions & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"extends": "standard",
"env": {
"es6": true,
"node": true
},
"globals": {
"document": false,
"window": false,
"console": false
},
"rules": {
"indent": [
2,
2
],
"semi": [
"error",
"always"
]
}
}
13 changes: 8 additions & 5 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
"configurations": [
{
"type": "node",
"request": "attach",
"name": "DEBUG Irongenerate",
"port": 9229,
"protocol": "inspector",
"restart": "true"
"request": "launch",
"name": "nodemon",
"runtimeExecutable": "nodemon",
"program": "${workspaceFolder}/bin/www",
"restart": true,
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
}

]
}
38 changes: 36 additions & 2 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,43 @@
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 indexRouter = require('./routes/index');
const signupRouter = require('./routes/signup');
const loginRouter = require('./routes/login');

const flash = require('connect-flash');

const hbs = require('hbs');

const app = express();

mongoose.connect('mongodb://localhost/basic-auth', {
// Cookies
app.use(session({
store: new MongoStore({
mongooseConnection: mongoose.connection,
ttl: 24 * 60 * 60 // 1 day
}),
secret: 'some-string',
resave: true,
saveUninitialized: true,
cookie: {
maxAge: 24 * 60 * 60 * 1000
}
}));
// Para mostras mensages
app.use(flash());

// conexions von base de datos
mongoose.connect('mongodb://localhost/logsign', {
keepAlive: true,
useNewUrlParser: true,
reconnectTries: Number.MAX_VALUE
Expand All @@ -21,10 +49,16 @@ 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')));
hbs.registerPartials(path.join(__dirname, '/views/partials'));

// Rutas de las carpetas
app.use('/', indexRouter);
app.use('/auth', signupRouter);
app.use('/auth', loginRouter);

// -- 404 and error handler

Expand Down
34 changes: 34 additions & 0 deletions middlewares/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
'use strict';

module.exports = {
requireAnon (req, res, next) {
// Si hay un usuario en la sesion
if (req.session.currentUser) {
res.redirect('/');
return;
}
next();
},

requireUser (req, res, next) {
// Si no hay un usuario en la sesion
if (!req.session.currentUser) {
res.redirect('/');
return;
}
next();
},

requireFields (req, res, next) {
// Si no se ha introducido o pasword o contraseña
const { username, password } = req.body;
if (!password || !username) {
// Muestra mensage que usuario o pasword se ha perdido
req.flash('validation', 'Username or passowrd missing');
// Redirecciona a
res.redirect(`/auth/${req.path}`);
return;
}
next();
}
};
19 changes: 19 additions & 0 deletions models/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
'use strict';

const mongoose = require('mongoose');
const Schema = mongoose.Schema;

const userSchema = new Schema({
username: {
type: String,
required: true
},
password: {
type: String,
required: true
}
});

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

module.exports = User;
Loading