auth & dotenv added

Author: wayne-th

config/config.js

@@ -1,20 +1,20 @@
-var config = require('./config'),
-    express = require('express'),
-    morgan = require('morgan'),
-    compress = require('compression'),
-    bodyParser = require('body-parser'),
-    methodOverride = require('method-override')
-    passport = require('passport'),
-    helmet = require('helmet'),
-    cors = require('cors'),
-    ApiRoutes = require('./routes');
+const express = require('express');
+const morgan = require('morgan');
+const compress = require('compression');
+const bodyParser = require('body-parser');
+const methodOverride = require('method-override');
+const passport = require('passport');
+const helmet = require('helmet');
+const cors = require('cors');
+const ApiRoutes = require('../routes');
+const path = require('path');
 
 module.exports = function () {
     var app = express();
 
-    if (process.env.NODE_DEV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
         app.use(morgan('dev'));
-    } else if (process.env.NODE_DEV === 'production') {
+    } else if (process.env.NODE_ENV === 'production') {
         app.use(compress());
     }
 
@@ -24,23 +24,17 @@ module.exports = function () {
     app.use(bodyParser.json());
     app.use(methodOverride());
 
-    app.use(session({
-        saveUninitialized: true,
-        resave: true,
-        secret: config.sessionSecret
-    }));
-
     app.use(passport.initialize());
     app.use(passport.session());
     app.use(helmet());
     app.use(cors());
 
-    app.use('/api', ApiRoutes);
+    app.use(`/${process.env.API}`, ApiRoutes);
 
     // require('../app/routes/index.routes.js') (app);
     // require('../app/routes/users.routes.js') (app);
 
-    app.use(express.static('./public'));
+    app.use(express.static(path.join(__dirname, "public")));
 
     return app;
 }

config/env/development.js

@@ -10,9 +10,9 @@ module.exports = function() {
 
     // Connect the db with the url provide
     try {
-        var db = mongoose.connect(config.db);
+        var db = mongoose.connect(process.env.DB_URL);
     } catch (err) {
-        var db = mongoose.createConnection(config.db);
+        var db = mongoose.createConnection(process.env.DB_URL);
     }
 
     mongoose.connection
@@ -21,7 +21,7 @@ module.exports = function() {
         throw e;
       });
 
-    require('../models/user.models');
+    require('../models/user.model');
 
     return db;
 };

config/express.js

@@ -1,5 +1,5 @@
-var passport = require('passport'),
-    mongoose = require('mongoose');
+const passport = require('passport');
+const mongoose = require('mongoose');
 
 module.exports = function() {
     var User = mongoose.model('User');
@@ -16,6 +16,7 @@ module.exports = function() {
         });
     });
 
-    require('./strategies/local.js')();
+    require('./strategies/register.js')();
+    require('./strategies/login.js')();
     require('./strategies/jwt.js')();
 }

config/mongoose.js

@@ -1,22 +1,24 @@
-var passport = require('passport'),
-    User = require('mongoose').model('User');
-
-import { Strategy as JWTStrategy, ExtractJwt } from 'passport-jwt';
+const passport = require('passport');
+const User = require('mongoose').model('User');
 
+const JWTStrategy = require('passport-jwt').Strategy;
+const ExtractJwt = require('passport-jwt').ExtractJwt;
 
 /**
  * JWT Strategy Auth
  */
 const jwtOpts = {
     // Telling Passport to check authorization headers for JWT
-    jwtFromRequest: ExtractJwt.fromAuthHeaderWithScheme('JWT'),
+    jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
     // Telling Passport where to find the secret
-    secretOrKey: constants.JWT_SECRET,
+    secretOrKey: process.env.JWT_SECRET,
 };
 
 module.exports = function() {
-    passport.use(new JWTStrategy(jwtOpts, function(payload, done){
-        User.findById(payload._id , function(err, user) {
+    passport.use(
+        'jwt',
+        new JWTStrategy(jwtOpts, function(payload, done){
+        User.findById(payload._id).then((user, err) => {
             if (err) {
                 return done(err, false);
             }

config/passport.js

@@ -0,0 +1,38 @@
+const passport = require('passport');
+const LocalStrategy = require('passport-local').Strategy;
+const User = require('mongoose').model('User');
+
+module.exports = function() {
+    passport.use(
+        'login',
+        new LocalStrategy({
+            usernameField: 'email',
+            passwordField: 'password'
+        }, (username, password, done) => {
+            User.findOne({
+                email: username
+            }, (err, user) => {
+                if (err) {
+                    return done(err);
+                }
+
+                if (!user) {
+                    return done(null, false, {
+                        message: 'invalid username',
+                    });
+                }
+
+                if (!user.authenticateUser(password)) {
+                    return done(null, false, {
+                        message: 'invalid password',
+                    });
+                }
+
+                return done(null, user);
+            });
+    }));
+};
+
+
+
+

config/strategies/jwt.js

@@ -0,0 +1,31 @@
+const passport = require('passport');
+const LocalStrategy = require('passport-local').Strategy;
+const User = require('mongoose').model('User');
+
+module.exports = function() {
+    passport.use(
+        'register',
+        new LocalStrategy({
+            usernameField: 'email',
+            passwordField: 'password'
+        }, (username, password, done) => {
+            User.findOne({
+                username: username
+            }, (err, user) => {
+                if (err) {
+                    return done(err);
+                }
+
+                if (user) {
+                    return done(null, false, {
+                        message: 'username already taken',
+                    });
+                }
+
+                User.create({email: username, password})
+                .then(user => {
+                    return done(null, user);
+                });
+            });
+    }));
+};

config/strategies/local.js

@@ -1,109 +1,39 @@
-import User from '../models/user.model';
+const User = require('../models/user.model');
+const authCtrl = {};
 
-import HTTPStatus from 'http-status';
-import Joi from 'joi';
- 
-export const validation = {
-  login: {
-    body: {
-      email: Joi.string()
-        .email()
-        .required(),
-      password: Joi.string()
-        .regex(/^[a-zA-Z0-9]{3,30}$/)
-        .required(),
-    },
-  },
-  create: {
-    body: {
-      email: Joi.string()
-        .email()
-        .required(),
-      password: Joi.string()
-        .min(6)
-        .regex(/^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$/)
-        .required(),
-      username: Joi.string()
-        .min(3)
-        .max(20)
-        .required(),
-    },
-  },
-};
-
- 
- /**
-  * @api {post} /users/login Login a user
-  * @apiDescription Login a user
-  * @apiName loginUser
-  * @apiGroup User
-  *
-  * @apiParam (Body) {String} email User email.
-  * @apiParam (Body) {String} password User password.
-  *
-  * @apiSuccess {Number} status Status of the Request.
-  * @apiSuccess {String} _id User _id.
-  * @apiSuccess {String} token Authentication token.
-  *
-  * @apiSuccessExample Success-Response:
-  *
-  * HTTP/1.1 200 OK
-  *
-  * {
-  *  _id: '123',
-  *  token: 'JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1OTBhMWI3ODAzMDI3N2NiNjQxM2JhZGUiLCJpYXQiOjE0OTM4MzQ2MTZ9.RSlMF6RRwAALZQRdfKrOZWnuHBk-mQNnRcCLJsc8zio',
-  * }
-  *
-  * @apiErrorExample {json} Error
-  *  HTTP/1.1 400 Bad Request
-  *
-  *  {
-  *    email: 'email is required'
-  *  }
-  */
- 
-export async function login(req, res, next) {
-  res.status(HTTPStatus.OK).json(req.user.toAuthJSON());
+authCtrl.register = (req, res, next) => {
+    const data = {
+        name: req.body.name,
+        username: req.body.username,
+        email: req.user.email,
+    };
+    User.findOne({
+        email: data.email
+    })
+    .then(user => {
+        user.updateOne(data)
+        .then(user => {
+            res.status(200).send(user.toAuthJSON());
+        })
+    })
+}
 
-  return next();
+authCtrl.login = (req, res, next) => {
+    User.findOne({
+        username: req.user.username
+    })
+    .then(user => {
+        res.status(200).send(user.toAuthJSON());
+    })
 }
 
-/**
- * @api {post} /users/signup Create a user
- * @apiDescription Create a user
- * @apiName createUser
- * @apiGroup User
- *
- * @apiParam (Body) {String} email User email.
- * @apiParam (Body) {String} password User password.
- * @apiParam (Body) {String} username User username.
- *
- * @apiSuccess {Number} status Status of the Request.
- * @apiSuccess {String} _id User _id.
- * @apiSuccess {String} token Authentication token.
- *
- * @apiSuccessExample Success-Response:
- *
- * HTTP/1.1 200 OK
- *
- * {
- *  _id: '123',
- *  token: 'JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1OTBhMWI3ODAzMDI3N2NiNjQxM2JhZGUiLCJpYXQiOjE0OTM4MzQ2MTZ9.RSlMF6RRwAALZQRdfKrOZWnuHBk-mQNnRcCLJsc8zio',
- * }
- *
- * @apiErrorExample {json} Error
- *  HTTP/1.1 400 Bad Request
- *
- *  {
- *    email: 'email is required'
- *  }
- */
-export async function create(req, res, next) {
-    try {
-      const user = await User.create(req.body);
-      return res.status(HTTPStatus.CREATED).json(user.toAuthJSON());
-    } catch (e) {
-      e.status = HTTPStatus.BAD_REQUEST;
-      return next(e);
-    }
-  }
+authCtrl.tokenLogin = async (user, req, res, next) => {
+    User.findOne({
+        username: user.username
+    })
+    .then(user => {
+        res.status(200).send(user.toAuthJSON());
+    })
+};
+
+module.exports = authCtrl;