diff --git a/package.json b/package.json index 947f5751..ffd73ef1 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "jwt-simple": "^0.5.0", "mongoose": "^4.4.16", "passport": "^0.3.2", - "passport-github": "^1.1.0",g + "passport-github": "^1.1.0", "passport-jwt": "^2.0.0", "passport-local": "^1.0.0", "react": "^15.0.2", diff --git a/server/controllers/user.controller.js b/server/controllers/user.controller.js index c6de9d32..a8616652 100644 --- a/server/controllers/user.controller.js +++ b/server/controllers/user.controller.js @@ -9,6 +9,7 @@ export function newUser(req, res) { } export function createUser(req, res, next) { + console.log("in create user"); const user = new User({ username: req.body.username, email: req.body.email, diff --git a/server/server.js b/server/server.js index 9cafa01b..02fe4d1c 100644 --- a/server/server.js +++ b/server/server.js @@ -24,24 +24,11 @@ import serverConfig from './config'; import users from './routes/user.routes'; //Body parser, cookie parser, sessions, serve public assets -const MongoStore = require('connect-mongo')(session); app.use(Express.static(path.resolve(__dirname, '../static'))); app.use(bodyParser.urlencoded({extended: true})); app.use(bodyParser.json()); app.use(cookieParser()); -app.use(session({ - //this should be SECRET AND IN A SECRET FILE - //TODO add dotenv - secret: 'steve brule', - resave: true, - saveUninitialized: true, - store: new MongoStore({ - // url: process.env.MONGODB_URI || process.env.MONGOLAB_URI, - url: serverConfig.mongoURL, - autoReconnect: true - }) -})); app.use(passport.initialize()); app.use(passport.session()); app.use('/', users);