everything switched over, time to test

admin/server/index.js

@@ -8,7 +8,7 @@ const configureExpress = require("./config/express");
 const systems = require("./controllers/systems");
 const groups = require("./controllers/groups");
 const talkgroups = require("./controllers/talkgroups");
-const Permission = require("./models/permission");
+
 require("./models/user");
 const multer = require('multer');
 
@@ -60,26 +60,6 @@ mongoose.connection.on('disconnected', () => {
 const isDev = process.env.NODE_ENV === "development"
 
 
-/*
-async function getRole(req) {
-  let promise = new Promise((resolve, reject) => {
-    if (req.params.shortName && req.user) {
-    var short_name = req.params.shortName.toLowerCase();
-    var userId = req.user._id;
-    Permission.findOne({'userId': userId, 'shortName': short_name}, function(err, permission) {
-      if (err) {
-        console.error('Error - getRole userId: ' + userId + ' shortName: ' + short_name + ' error: ' + err);
-        reject(-1);
-      }
-      console.log('Found - getRole userId: ' + userId + ' shortName: ' + short_name + ' role: ' + permission.role);
-
-      resolve(permission.role);
-    });
-  } else {
-    reject(-1);
-  }});
-  return promise;
-}*/
 
 
 

admin/server/models/user.js

@@ -0,0 +1,87 @@
+// Defining a User Model in mongoose
+// Code modified from https://github.com/sahat/hackathon-starter
+const bcrypt = require("bcrypt");
+const mongoose = require("mongoose");
+
+
+
+const UserSchema = new mongoose.Schema({
+	local: {
+		name: String,
+		email: String,
+		password: String
+	},
+	email: {
+		type: String,
+		unique: true,
+		lowercase: true
+	},
+	password: String,
+	screenName: {
+		type: String,
+		unique: true,
+		lowercase: true
+	},
+	firstName: String,
+	lastName: String,
+	location: String,
+	email: String,
+	resetPasswordToken: String,
+	resetPasswordTTL: Date,
+	confirmEmail: {
+		type: Boolean,
+		default: false
+	},
+	confirmEmailToken: String,
+	confirmEmailTTL: Date,
+	admin: {
+		type: Boolean,
+		default: false
+	},
+	terms: {
+		type: Number,
+		default: 0
+	},
+	ver: {
+		type: Number,
+		default: 1.1
+	},
+	sysCount: Number,
+	lastLogin: { type : Date, default: Date.now }
+})
+
+/**
+ * Password hash middleware.
+ */
+UserSchema.pre("save", function(next) {
+	var user = this
+	if (!user.isModified("password")) return next()
+	bcrypt.genSalt(8, (err, salt) => {
+		if (err) return next(err)
+		bcrypt.hash(user.password, salt, null, (err, hash) => {
+			if (err) return next(err)
+			user.password = hash;
+			user.local.password = hash;
+			next()
+		})
+	})
+})
+
+/*
+ Defining our own custom document instance method
+ */
+ UserSchema.methods = {
+ 	comparePassword: function(candidatePassword, cb) {
+ 		bcrypt.compare(candidatePassword, this.local.password, (err, isMatch) => {
+ 			if (err) return cb(err)
+ 			cb(null, isMatch)
+ 		})
+ 	}
+ }
+
+/**
+* Statics
+*/
+UserSchema.statics = {}
+
+module.exports = mongoose.model("User", UserSchema)