Skip to content

BCN - WDFT - FRAN #12

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

BCN - WDFT - FRAN #12

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
c6a1549
First commit, project ready to work
franlol Mar 4, 2019
f52b40c
Login done, content left
franlol Mar 4, 2019
847e502
done
franlol 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,
4
],
"semi": [
"error",
"always"
]
}
}
14 changes: 8 additions & 6 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"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"
},
]
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"editor.tabSize": 2
"editor.tabSize": 4
}
56 changes: 40 additions & 16 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,43 @@
const createError = require('http-errors');
// 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 flash = require('connect-flash');
const session = require('express-session');
const MongoStore = require('connect-mongo')(session);

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

const authRouter = require('./routes/auth');
const contentRouter = require('./routes/content');
const app = express();

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
}
}));

app.use((req, res, next) => {
app.locals.user = req.session.user;
next();
});

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

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'hbs');
Expand All @@ -25,25 +49,25 @@ app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));

app.use('/', indexRouter);
app.use('/', contentRouter);
app.use('/auth', authRouter);

// -- 404 and error handler

// NOTE: requires a views/not-found.ejs template
app.use((req, res, next) => {
res.status(404);
res.render('not-found');
res.status(404);
res.render('not-found');
});

// NOTE: requires a views/error.ejs template
app.use((err, req, res, next) => {
// always log the error
console.error('ERROR', req.method, req.path, err);

// only render if the error ocurred before sending the response
if (!res.headersSent) {
res.status(500);
res.render('error');
}
// always log the error
console.error('ERROR', req.method, req.path, err);
// only render if the error ocurred before sending the response
if (!res.headersSent) {
res.status(500);
res.render('error');
}
});

module.exports = app;
24 changes: 24 additions & 0 deletions middlewares/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
requireUser (req, res, next) {
if (!req.session.user) {
return res.redirect('/');
}
next();
},
requireAnon (req, res, next) {
if (req.session.user) {
res.redirect('/');
return;
}
next();
},
requireFields (req, res, next) {
const { username, password } = req.body;
if (!password || !username) {
req.flash('validation', 'Username or pw missing');
res.redirect('/auth' + req.path);
return;
}
next();
}
};
17 changes: 17 additions & 0 deletions models/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
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('User', userSchema);

module.exports = User;
Loading