r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

add framework for sessions

This commit is contained in:
catarak 2016-05-13 16:49:56 -04:00
parent d8bdc9a232
commit 4c8684877e
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package.json
View File

@ -35,7 +35,6 @@
"dependencies": { "dependencies": {
"axios": "^0.12.0", "axios": "^0.12.0",
"babel-core": "^6.8.0", "babel-core": "^6.8.0",
<<<<<<< HEAD
"bcrypt-nodejs": "0.0.3", "bcrypt-nodejs": "0.0.3",
"body-parser": "^1.15.1", "body-parser": "^1.15.1",
"classnames": "^2.2.5", "classnames": "^2.2.5",
@ -50,14 +49,6 @@
"passport-github": "^1.1.0", "passport-github": "^1.1.0",
"passport-jwt": "^2.0.0", "passport-jwt": "^2.0.0",
"passport-local": "^1.0.0", "passport-local": "^1.0.0",
=======
"body-parser": "^1.15.1",
"classnames": "^2.2.5",
"codemirror": "^5.14.2",
"cookie-parser": "^1.4.1",
"express": "^4.13.4",
"mongoose": "^4.4.16",
>>>>>>> add session and cookie and passport config for server
"react": "^15.0.2", "react": "^15.0.2",
"react-dom": "^15.0.2", "react-dom": "^15.0.2",
"react-inlinesvg": "^0.4.2", "react-inlinesvg": "^0.4.2",

1
server/routes/session.routes.js
View File

@ -1,6 +1,7 @@
import { Router } from 'express'; import { Router } from 'express';
import * as SessionController from '../controllers/session.controller'; import * as SessionController from '../controllers/session.controller';
import passport from 'passport'; import passport from 'passport';
const router = new Router(); const router = new Router();
router.route('/login').get(SessionController.newSession); router.route('/login').get(SessionController.newSession);

9
server/server.js
View File

@ -24,18 +24,11 @@ import serverConfig from './config';
import users from './routes/user.routes'; import users from './routes/user.routes';
//Body parser, cookie parser, sessions, serve public assets //Body parser, cookie parser, sessions, serve public assets
//Body parser, cookie parser, sessions, serve public assets
app.use(bodyParser.urlencoded({extended: true}));
app.use(bodyParser.json());
app.use(cookieParser());
app.use(session({secret: 'steve brule'}));
app.use(passport.initialize());
app.use(passport.session());
app.use(Express.static(path.resolve(__dirname, '../static'))); app.use(Express.static(path.resolve(__dirname, '../static')));
app.use(bodyParser.urlencoded({extended: true})); app.use(bodyParser.urlencoded({extended: true}));
app.use(bodyParser.json()); app.use(bodyParser.json());
app.use(cookieParser()); app.use(cookieParser());
app.use(session({secret: 'steve brule'}));
app.use(passport.initialize()); app.use(passport.initialize());
app.use(passport.session()); app.use(passport.session());
app.use('/', users); app.use('/', users);