ORM Update

GhoulAlert/app.js

@@ -7,6 +7,10 @@ var logger = require('morgan');
 var indexRouter = require('./routes/index');
 var usersRouter = require('./routes/users');
 
+require('./config/passport');
+var apiV1IndexRouter = require('./routes/apiV1/index');
+var apiV1UsersRouter = require('./routes/apiV1/users');
+
 var app = express();
 
 // view engine setup
@@ -21,6 +25,8 @@ app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
+app.use('/apiV1', apiV1IndexRouter);
+app.use('/apiV1/users', apiV1UsersRouter);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {

GhoulAlert/bin/www

@@ -7,6 +7,7 @@
 var app = require('../app');
 var debug = require('debug')('ghoulalert:server');
 var http = require('http');
+var models = require('../models');
 
 /**
  * Get port from environment and store in Express.
@@ -21,13 +22,15 @@ app.set('port', port);
 
 var server = http.createServer(app);
 
-/**
- * Listen on provided port, on all network interfaces.
- */
+models.sequelize.sync().then(function(){
+  /**
+   * Listen on provided port, on all network interfaces.
+   */
 
-server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
+  server.listen(port);
+  server.on('error', onError);
+  server.on('listening', onListening);
+})
 
 /**
  * Normalize a port into a number, string, or false.

GhoulAlert/config/config.json

@@ -0,0 +1,23 @@
+{
+  "development": {
+    "username": "ghoul",
+    "password": "ghoul_user!61",
+    "database": "ghoul_development",
+    "host": "127.0.0.1",
+    "dialect": "mysql"
+  },
+  "test": {
+    "username": "ghoul",
+    "password": "ghoul_user!61",
+    "database": "ghoul_test",
+    "host": "127.0.0.1",
+    "dialect": "mysql"
+  },
+  "production": {
+    "username": "root",
+    "password": null,
+    "database": "ghoul_production",
+    "host": "127.0.0.1",
+    "dialect": "mysql"
+  }
+}

GhoulAlert/config/passport.js

@@ -0,0 +1,19 @@
+'use strict';
+
+var models  = require('../models');
+var passport = require('passport');
+var localStrat = require('passport-local');
+
+var User = models.User;
+
+passport.use(new localStrat({
+  usernameField: 'username',
+  passwordField: 'password',
+}, (username, password, done) => {
+  User.findOne({ where: { username: username } }).then((user) => {
+    if(!user || !user.validatePassword(password)) {
+      return done(null, false, { errors: {'username or password': 'is invalid'}});
+    }
+    return done(null, user);
+  }).catch(done);
+}));

GhoulAlert/models/index.js

@@ -0,0 +1,41 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const Sequelize = require('sequelize');
+const basename = path.basename(__filename);
+const env = process.env.NODE_ENV || 'development';
+const config = require(__dirname + '/../config/config.json')[env];
+const db = {};
+
+let sequelize;
+if (config.use_env_variable) {
+  sequelize = new Sequelize(process.env[config.use_env_variable], config);
+} else {
+  sequelize = new Sequelize(config.database, config.username, config.password, config);
+}
+
+fs
+  .readdirSync(__dirname)
+  .filter(file => {
+    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
+  })
+  .forEach(file => {
+    const model = sequelize['import'](path.join(__dirname, file));
+    db[model.name] = model;
+  });
+
+Object.keys(db).forEach(modelName => {
+  if (db[modelName].associate) {
+    db[modelName].associate(db);
+  }
+});
+
+// Relationships go here
+db.User.hasMany(db.Marker);
+db.Marker.belongsTo(db.User);
+
+db.sequelize = sequelize;
+db.Sequelize = Sequelize;
+
+module.exports = db;

GhoulAlert/models/marker.js

@@ -0,0 +1,46 @@
+'use strict';
+
+module.exports = (sequelize, DataTypes) => {
+  var Marker = sequelize.define('Marker', {
+      id: {
+          type: DataTypes.INTEGER,
+          primaryKey: true,
+          autoIncrement: true
+      },
+
+      latitude: {
+        type: DataTypes.FLOAT,
+        allowNull: false,
+        validate: {
+          notEmpty: true
+        }
+      },
+
+      longitude: {
+        type: DataTypes.FLOAT,
+        allowNull: false,
+        validate: {
+          notEmpty: true
+        }
+      },
+
+      name: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        unique: {
+          args: true,
+          msg: "Name of the marker must be unique"
+        },
+        validate: {
+          notEmpty: true
+        }
+      },
+
+      description: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      }
+  });
+
+  return Marker;
+}

GhoulAlert/models/user.js

@@ -0,0 +1,67 @@
+'use strict';
+const crypto = require('crypto');
+const jwt = require('jsonwebtoken');
+
+module.exports = (sequelize, DataTypes) => {
+  // Define the user model
+  var User = sequelize.define('User', {
+    // The user has an id, which identifies them and acts as a primary key
+    id: {
+      type: DataTypes.INTEGER,
+      primaryKey: true,
+      autoIncrement: true
+    },
+    // The user has a "username", of the string datatype, that is unique
+    username: {
+      type: DataTypes.STRING,
+      allowNull: false,
+      unique: {
+          args: true,
+          msg: "Username already exists; it must be unique."
+      }
+    },
+
+    // The user has a "password", composed of a hash and salt
+    hash: DataTypes.TEXT('long'),
+    salt: DataTypes.TEXT('long')
+  })
+
+  User.prototype.setPassword = function(password) {
+    this.salt = crypto.randomBytes(16).toString('hex');
+    this.hash = crypto.pbkdf2Sync(password, this.salt, 10000, 512, 'sha512').toString('hex');
+  }
+
+  User.prototype.validatePassword = function(password) {
+    const hash = crypto.pbkdf2Sync(password, this.salt, 10000, 512, 'sha512').toString('hex');
+    return this.hash === hash;
+  }
+
+  User.prototype.generateJWT = function() {
+    const today = new Date();
+    const expires = new Date(today);
+    expires.setDate(today.getDate() + 30);
+
+    return jwt.sign({
+      username: this.username,
+      id: this.id,
+      exp: parseInt(expires.getTime() / 1000, 10),
+    }, 'secret');
+  }
+
+  User.prototype.toAuthJSON = function() {
+      return {
+        id: this.id,
+        username: this.username,
+        token: this.generateJWT()
+      };
+  }
+
+  User.prototype.toJSON = function() {
+    return {
+      id: this.id,
+      username: this.username
+    }
+  }
+
+  return User;
+}