From c9b8c8fb568eb5b31a704b71dbb8b1e32929bb53 Mon Sep 17 00:00:00 2001
From: pb-coding <71174645+pb-coding@users.noreply.github.com>
Date: Fri, 25 Feb 2022 14:22:23 +0100
Subject: [PATCH] roles were hardcoded - now requested from db

---
 app/middleware/verifySignUp.js | 9 ++++++---
 app/models/index.js            | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/middleware/verifySignUp.js b/app/middleware/verifySignUp.js
index c17fc6b..b29bdca 100644
--- a/app/middleware/verifySignUp.js
+++ b/app/middleware/verifySignUp.js
@@ -1,5 +1,4 @@
 const db = require("../models");
-const ROLES = db.ROLES;
 const User = db.user;
 
 checkDuplicateUsernameOrEmail = async (req, res, next) => {
@@ -38,10 +37,14 @@ checkDuplicateUsernameOrEmail = async (req, res, next) => {
   }
 };
 
-checkRolesExisted = (req, res, next) => {
+checkRolesExisted = async (req, res, next) => {
+  const roles = await db.role.findAll()
+  let roleNames = []
+  roles.forEach(role => roleNames.push(role.name))
+
   if (req.body.roles) {
     for (let i = 0; i < req.body.roles.length; i++) {
-      if (!ROLES.includes(req.body.roles[i])) {
+      if (!roleNames.includes(req.body.roles[i])) {
         res.status(400).send({
           message: "Failed! Role does not exist = " + req.body.roles[i]
         });
diff --git a/app/models/index.js b/app/models/index.js
index 99f94de..8bebfad 100644
--- a/app/models/index.js
+++ b/app/models/index.js
@@ -38,6 +38,4 @@ db.user.belongsToMany(db.role, {
   otherKey: "roleId"
 });
 
-db.ROLES = ["user", "admin", "moderator"];
-
 module.exports = db;