mostly seems to be working!

admin/server/config/express.js

@@ -11,6 +11,7 @@ var backend_server = process.env['REACT_APP_BACKEND_SERVER'] != null ? process.e
 var frontend_server = process.env['REACT_APP_FRONTEND_SERVER'] != null ? process.env['REACT_APP_FRONTEND_SERVER'] : 'https://openmhz.com';
 var socket_server = process.env['REACT_APP_SOCKET_SERVER'] != null ? process.env['REACT_APP_SOCKET_SERVER'] : 'wss://socket.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
 var account_server = process.env['REACT_APP_ACCOUNT_SERVER'] != null ? process.env['REACT_APP_ACCOUNT_SERVER'] : 'https://account.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
+var dev_server = frontend_server + ":3000"
 
 module.exports = function(app, passport) {
 	app.set("port", 3008)
@@ -19,7 +20,7 @@ module.exports = function(app, passport) {
 	// Keeping it makes it easier for an attacker to build the site's profile
 	// It can be removed safely
 	app.disable("x-powered-by")
-
+	app.enable('trust proxy')
 	app.use(bodyParser.json())
 	app.use(bodyParser.urlencoded({ extended: true }))
 	app.use(express.static(path.join(process.cwd(), 'public')));
@@ -62,10 +63,10 @@ module.exports = function(app, passport) {
 	    allowedOrigins.push(frontend_server);
 	    allowedOrigins.push(backend_server);
 	    allowedOrigins.push(socket_server);
+		allowedOrigins.push(dev_server);
 
 	    var origin = req.headers.origin;
 
-
 	    if (allowedOrigins.indexOf(origin) > -1) {
 	        res.setHeader('Access-Control-Allow-Origin', origin);
 	    } else if (req.headers["user-agent"] == 'TrunkRecorder1.0') {

admin/server/config/passport.js

@@ -10,16 +10,17 @@ module.exports = function (app, passport) {
   // typical implementation of this is as simple as supplying the user ID when
   // serializing, and querying the user record by ID from the database when
   // deserializing.
-  passport.serializeUser((user, done) => {  	
+  passport.serializeUser((user, done) => {
   	done(null, user.id)
   })
 
   passport.deserializeUser((id, done) => {
-  	User.findById(id, (err, user) => {      
-  		done(err, user)
+  	User.findById(id, (err, user) => {
+      done(err, user)
   	})
   })
 
+
   // use the following strategies
   passport.use(local)
 }

admin/server/controllers/systems.js

@@ -213,7 +213,7 @@ exports.ownSystem = async function (req, res, next) {
     next();
 
   } catch (err) {
-    console.error("ERROR: Unique ShortName - caught: " + err);
+    console.error("ERROR: ownSystem - caught: " + err);
     res.json({
       success: false,
       message: err
@@ -225,10 +225,24 @@ exports.ownSystem = async function (req, res, next) {
 
 // -------------------------------------------
 exports.uniqueShortName = async function (req, res, next) {
-  console.error("locals: " + res.locals.shortName + " body: " + req.body.shortName )
+
+  var shortName = res.locals.shortName;
+  if (typeof shortName == 'undefined') {
+    console.error("locals: " + res.locals.shortName + " body: " + req.body.shortName )
+    console.error("ShortName is not in res.local, pulling from req.body instead")
+    shortName = req.body.shortName;
+  }
+  if (typeof shortName == 'undefined') {
+    console.error("ShortName is not in req.body instead")
+    res.json({
+      success: false,
+      message: "Short Name not provided in form"
+    });
+  }
+
   try {
     var system = await System.findOne({
-      shortName: res.locals.shortName.toLowerCase()
+      shortName: shortName.toLowerCase()
     });
 
     if (system) {
@@ -434,12 +448,7 @@ exports.validateSystem = async function (req, res, next) {
 
 exports.createSystem = async function (req, res, next) {
 
-  var key = uuid.v4();
-  key = crypto
-    .createHash("sha256")
-    .update(key)
-    .update("salt")
-    .digest("hex");
+  var key = crypto.randomBytes(16).toString("hex");
   const system = (({
     name,
     shortName,

admin/server/index.js

@@ -13,28 +13,54 @@ require("./models/user");
 const multer = require('multer');
 
 var upload = multer({
-    dest: 'uploads/'
+  dest: 'uploads/'
 });
 // -------------------------------------------
 
-const app = express() 
+const app = express()
 
 // -------------------------------------------
 
-const connect = () => {
-	mongoose.connect(secrets.db, (err, res) => {
-		if (err) {
-			console.log(`Error connecting to ${secrets.db}. ${err}`)
-		} else {
-			console.log(`Successfully connected to ${secrets.db}.`)
-		}
-	})
+// -------------------------------------------
+
+async function connect() {
+
+  // Demonstrate the readyState and on event emitters
+  console.log(mongoose.connection.readyState); //logs 0
+  mongoose.connection.on('connecting', () => {
+    console.log('Mongoose is connecting')
+    console.log(mongoose.connection.readyState); //logs 2
+  });
+  mongoose.connection.on('connected', () => {
+    console.log('Mongoose is connected');
+    console.log(mongoose.connection.readyState); //logs 1
+  });
+  mongoose.connection.on('disconnecting', () => {
+    console.log('Mongoose is disconnecting');
+    console.log(mongoose.connection.readyState); // logs 3
+  });
+
+  // Connect to a MongoDB server running on 'localhost:27017' and use the
+  // 'test' database.
+  await mongoose.connect(secrets.db, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true }, (err, res) => {
+    if (err) {
+      console.log(`Mongoose - Error connecting to ${secrets.db}. ${err}`)
+    } else {
+      console.log(`Mongoose Successfully connected to ${secrets.db}.`)
+    }
+  })
+  console.log("All Done");
 }
-connect()
-
-mongoose.connection.on("error", console.error)
-mongoose.connection.on("disconnected", connect)
-
+connect();
+mongoose.connection.on('error', err => {
+  console.error("Mongoose Error!")
+  console.error(err);
+});
+mongoose.connection.on('disconnected', () => {
+  console.log('Mongoose disconnected');
+  console.log(mongoose.connection.readyState); //logs 0
+  connect();
+});
 // -------------------------------------------
 
 const isDev = process.env.NODE_ENV === "development"
@@ -67,12 +93,12 @@ function isOwner(req, res, next) {
   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) {
+    Permission.findOne({ 'userId': userId, 'shortName': short_name }, function (err, permission) {
       if (err) {
         console.error('Error - getRole userId: ' + userId + ' shortName: ' + short_name + ' error: ' + err);
       }
       console.log('Found - getRole userId: ' + userId + ' shortName: ' + short_name + ' role: ' + permission.role);
-      if ( permission.role >= 15) {
+      if (permission.role >= 15) {
         return next();
       } else {
         res.status(401).send({
@@ -90,12 +116,12 @@ function isAdmin(req, res, next) {
   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) {
+    Permission.findOne({ 'userId': userId, 'shortName': short_name }, function (err, permission) {
       if (err) {
         console.error('Error - getRole userId: ' + userId + ' shortName: ' + short_name + ' error: ' + err);
       }
       console.log('Found - getRole userId: ' + userId + ' shortName: ' + short_name + ' role: ' + permission.role);
-      if (permission.role  >= 10) {
+      if (permission.role >= 10) {
         return next();
       } else {
         res.status(401).send({
@@ -129,27 +155,27 @@ app.get("")
 app.delete("/permissions/:shortName/:permissionId", isAdmin, permissions.deletePermission);
 app.post("/permissions/:shortName/:permissionId", isAdmin, permissions.updatePermission);
 app.post("/permissions/:shortName", isAdmin, permissions.addPermission);*/
-app.get("/talkgroups/:shortName", isLoggedIn,  talkgroups.fetchTalkgroups)
-app.post("/talkgroups/:shortName/import", isLoggedIn, upload.single('file'),  talkgroups.importTalkgroups)
-app.get("/talkgroups/:shortName/export", isLoggedIn,  talkgroups.exportTalkgroups)
+app.get("/talkgroups/:shortName", isLoggedIn, talkgroups.fetchTalkgroups)
+app.post("/talkgroups/:shortName/import", isLoggedIn, upload.single('file'), talkgroups.importTalkgroups)
+app.get("/talkgroups/:shortName/export", isLoggedIn, talkgroups.exportTalkgroups)
 app.post("/groups/:shortName/reorder", isLoggedIn, groups.reorderGroups);
 app.post("/groups/:shortName/:groupId?", isLoggedIn, groups.upsertGroup);
 app.get("/groups/:shortName/:groupId?", isLoggedIn, groups.getGroups);
 app.delete("/groups/:shortName/:groupId", isLoggedIn, groups.deleteGroup);
-app.get("/systems", isLoggedIn,  systems.listSystems)
+app.get("/systems", isLoggedIn, systems.listSystems)
 app.delete("/systems/:shortName", isLoggedIn, systems.deleteSystem)
 app.post("/systems/:shortName", [isLoggedIn, systems.ownSystem, systems.validateSystem, systems.updateSystem])
 app.post("/systems", [isLoggedIn, systems.uniqueShortName, systems.validateSystem, systems.createSystem])
 
 app.get("*", (req, res, next) => {
-	res.sendFile(__dirname + '/public/index.html');
+  res.sendFile(__dirname + '/public/index.html');
 });
 
 // start listening to incoming requests
 app.listen(app.get("port"), app.get("host"), (err) => {
-	if (err) {
-		console.err(err.stack)
-	} else {
-		console.log(`App listening on port ${app.get("port")} [${process.env.NODE_ENV} mode]`)
-	}
+  if (err) {
+    console.err(err.stack)
+  } else {
+    console.log(`App listening on port ${app.get("port")} [${process.env.NODE_ENV} mode]`)
+  }
 })