Fixed bug in perm check middleware caused by last refactor

src/app/channel/channelManager.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
 const channelModel = require('../../schemas/channel/channelSchema');
-const userModel = require('../../schemas/userSchema');
+const {userModel} = require('../../schemas/userSchema');
 const loggerUtils = require('../../utils/loggerUtils');
 const activeChannel = require('./activeChannel');
 const chatHandler = require('./chatHandler');

src/app/channel/chatHandler.js

@@ -17,7 +17,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 //local imports
 const commandPreprocessor = require('./commandPreprocessor');
 const loggerUtils = require('../../utils/loggerUtils');
-const userModel = require('../../schemas/userSchema');
+const {userModel} = require('../../schemas/userSchema');
 
 module.exports = class{
     constructor(server){

src/app/channel/tokebot.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
 const tokeCommandModel = require('../../schemas/tokebot/tokeCommandSchema');
-const userModel = require('../../schemas/userSchema');
+const {userModel} = require('../../schemas/userSchema');
 const statModel = require('../../schemas/statSchema');
 const statSchema = require('../../schemas/statSchema');
 

src/controllers/adminPanelController.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Config
 const config = require('../../config.json');
-const userModel = require('../schemas/userSchema');
+const {userModel} = require('../schemas/userSchema');
 const permissionModel = require('../schemas/permissionSchema');
 const channelModel = require('../schemas/channel/channelSchema');
 const {exceptionHandler, errorHandler} = require("../utils/loggerUtils");

src/controllers/api/account/deleteController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 const accountUtils = require('../../../utils/sessionUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/account/registerController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 const userBanModel = require('../../../schemas/userBanSchema');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/account/updateController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 const accountUtils = require('../../../utils/sessionUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/admin/banController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const banModel = require('../../../schemas/userBanSchema');
 const permissionModel = require('../../../schemas/permissionSchema');
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 
 module.exports.get = async function(req, res){

src/controllers/api/admin/changeRankController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 const permissionModel = require('../../../schemas/permissionSchema');
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 
 //api change rank functions
 module.exports.post = async function(req, res){

src/controllers/api/admin/listUsersController.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 
 //api list account functions
 module.exports.get = async function(req, res){

src/controllers/api/channel/banController.js

@@ -19,7 +19,7 @@ const {validationResult, matchedData} = require('express-validator');
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 const permissionModel = require('../../../schemas/permissionSchema')
 

src/controllers/api/channel/rankController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 const permissionModel = require('../../../schemas/permissionSchema');
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 
 //api channel rank functions

src/controllers/api/channel/registerController.js

@@ -19,7 +19,7 @@ const {validationResult, matchedData} = require('express-validator');
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const userModel = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 
 //api account functions

src/controllers/profileController.js

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
-const userModel = require('../schemas/userSchema');
+const {userModel} = require('../schemas/userSchema');
 const {exceptionHandler, errorHandler} = require('../utils/loggerUtils');
 
 //Config

src/schemas/channel/channelSchema.js

@@ -21,7 +21,7 @@ const {validationResult, matchedData} = require('express-validator');
 //Local Imports
 const server = require('../../server');
 const statModel = require('../statSchema');
-const userModel = require('../userSchema');
+const {userModel} = require('../userSchema');
 const permissionModel = require('../permissionSchema');
 const channelPermissionSchema = require('./channelPermissionSchema');
 const channelBanSchema = require('./channelBanSchema');

src/schemas/permissionSchema.js

@@ -119,8 +119,11 @@ permissionSchema.statics.rankToNum = function(rank){
 }
 
 permissionSchema.statics.permCheck = async function(user, perm){
+    //Check if the user is null
     if(user != null){
-        const userDB = await userModel.findOne({user: user.user});
+        //This specific call is why we export the userModel the way we do
+        //Someone will yell at me for circular dependencies but the fucking interpreter isn't :P
+        const userDB = await userModel.userModel.findOne({user: user.user});
         return await this.permCheckByUserDoc(userDB, perm);
     }else{
         return await this.permCheckByUserDoc(null, perm);
@@ -154,13 +157,14 @@ permissionSchema.statics.permCheckByUserDoc = async function(user, perm){
 
 //Middleware for rank checks
 permissionSchema.statics.reqPermCheck = function(perm){
-    return async (req, res, next)=>{
-
-        if(await permissionSchema.statics.permCheck(req.session.user, perm)){
-            next();
-        }else{
-            return errorHandler(res, "You do not have a high enough rank to access this resource.", 'Unauthorized', 401);
-        }
+    return (req, res, next)=>{
+        permissionSchema.statics.permCheck(req.session.user, perm).then((access) => {
+            if(access){
+                next();
+            }else{
+                return errorHandler(res, "You do not have a high enough rank to access this resource.", 'Unauthorized', 401);
+            }
+        });
     }
 }
 

src/schemas/userBanSchema.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {mongoose} = require('mongoose');
 
 //Local Imports
-const userModel = require('./userSchema');
+const {userModel} = require('./userSchema');
 
 const userBanSchema = new mongoose.Schema({
     user: {

src/schemas/userSchema.js

@@ -402,4 +402,4 @@ userSchema.methods.nuke = async function(pass){
     }
 }
 
-module.exports = mongoose.model("user", userSchema);
+module.exports.userModel = mongoose.model("user", userSchema);

src/utils/sessionUtils.js

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //local imports
-const userModel = require('../schemas/userSchema');
+const {userModel} = require('../schemas/userSchema');
 const userBanModel = require('../schemas/userBanSchema')
 
 //this module is good for keeping wrappers for userModel and other shit in that does more session handling than database access/modification.