Merge pull request #60 from FullstackAcademy/dunder-db-only

Define user model directly by pulling in _db

Author: omriAckley

generated/server/db/index.js

@@ -2,5 +2,5 @@
 var db = require('./_db');
 module.exports = db;
 
-require('./models/user')(db);
+var User = require('./models/user');
 

generated/server/db/models/user.js

@@ -3,58 +3,53 @@ var crypto = require('crypto');
 var _ = require('lodash');
 var Sequelize = require('sequelize');
 
-module.exports = function (db) {
+var db = require('../_db');
 
-    db.define('user', {
-        email: {
-            type: Sequelize.STRING
+module.exports = db.define('user', {
+    email: {
+        type: Sequelize.STRING
+    },
+    password: {
+        type: Sequelize.STRING
+    },
+    salt: {
+        type: Sequelize.STRING
+    },
+    twitter_id: {
+        type: Sequelize.STRING
+    },
+    facebook_id: {
+        type: Sequelize.STRING
+    },
+    google_id: {
+        type: Sequelize.STRING
+    }
+}, {
+    instanceMethods: {
+        sanitize: function () {
+            return _.omit(this.toJSON(), ['password', 'salt']);
         },
-        password: {
-            type: Sequelize.STRING
-        },
-        salt: {
-            type: Sequelize.STRING
-        },
-        twitter_id: {
-            type: Sequelize.STRING
-        },
-        facebook_id: {
-            type: Sequelize.STRING
-        },
-        google_id: {
-            type: Sequelize.STRING
+        correctPassword: function (candidatePassword) {
+            return this.Model.encryptPassword(candidatePassword, this.salt) === this.password;
         }
-    }, {
-        instanceMethods: {
-            sanitize: function () {
-                return _.omit(this.toJSON(), ['password', 'salt']);
-            },
-            correctPassword: function (candidatePassword) {
-                return this.Model.encryptPassword(candidatePassword, this.salt) === this.password;
-            }
-        },
-        classMethods: {
-            generateSalt: function () {
-                return crypto.randomBytes(16).toString('base64');
-            },
-            encryptPassword: function (plainText, salt) {
-                var hash = crypto.createHash('sha1');
-                hash.update(plainText);
-                hash.update(salt);
-                return hash.digest('hex');
-            }
+    },
+    classMethods: {
+        generateSalt: function () {
+            return crypto.randomBytes(16).toString('base64');
         },
-        hooks: {
-            beforeValidate: function (user) {
-                if (user.changed('password')) {
-                    user.salt = user.Model.generateSalt();
-                    user.password = user.Model.encryptPassword(user.password, user.salt);
-                }
+        encryptPassword: function (plainText, salt) {
+            var hash = crypto.createHash('sha1');
+            hash.update(plainText);
+            hash.update(salt);
+            return hash.digest('hex');
+        }
+    },
+    hooks: {
+        beforeValidate: function (user) {
+            if (user.changed('password')) {
+                user.salt = user.Model.generateSalt();
+                user.password = user.Model.encryptPassword(user.password, user.salt);
             }
         }
-    });
-
-
-
-};
-
+    }
+});