Merge pull request #27 from Oik17/master

feat: added admin auth with q's

api/controllers/questions.js

@@ -1,9 +1,17 @@
 const ques = require("../models/ques");
+const jwt = require("jsonwebtoken");
 
 async function getQuestionByID(req, res) {
   try {
-    const questions = await ques.findById(req.body.id).populate("testCases");
-    console.log(questions);
+    var questions;
+    const decoded=req.user
+
+    if(decoded.userRole=='admin'){
+        questions = await ques.findById(req.body.id).populate("testCases");
+     }
+    else{ 
+      questions = await ques.findById(req.body.id).populate({path: 'testCases', match: {hidden: false}});
+    }
     if(questions.length==0){
       return res.status(404).json({
         message: "No questions found",
@@ -12,6 +20,7 @@ async function getQuestionByID(req, res) {
     else{
       return res.status(201).json(questions);
     }
+
   } catch (error) {
     return res.status(500).json({
       message: error.message,
@@ -21,17 +30,24 @@ async function getQuestionByID(req, res) {
 
 async function getAll(req, res) {
   try {
-    const questionsAll = await ques.find().populate("testCases");
-
+    var questionsAll;
+    const decoded=req.user;
+    if(decoded.userRole=='admin'){
+      questionsAll = await ques.find().populate("testCases");
+    }
+    else{
+    questionsAll = await ques.find().populate({path: 'testCases', match: {hidden: false}});
+    }
     if(questionsAll.length==0){
-      return res.status(404).json({
+        return res.status(404).json({
         message: "No questions found",
       })
     }
     else{
-      return res.status(201).json(questionsAll);
-    }
-} catch (error) {
+       return res.status(201).json(questionsAll);
+   }
+}
+ catch (error) {
     return res.status(500).json({
       message: error.message,
     });
@@ -40,8 +56,16 @@ async function getAll(req, res) {
 
 async function getByRound(req, res) {
   try {
-    const questionByRound = await ques.where("round").equals(req.body.round).populate("testCases");
-    console.log(questionByRound);
+    var questionByRound;
+    const decoded=req.user;
+    if(decoded.userRole=='admin'){
+      questionByRound = await ques.where("round").equals(req.body.round).populate("testCases");
+    }
+    else{
+      questionByRound = await ques.where("round").equals(req.body.round).populate({path: 'testCases', match: {hidden: false}});
+
+    }
+
     if(questionByRound.length==0){
       return res.status(404).json({
         message: "No questions found",
@@ -102,7 +126,7 @@ async function createQuestion(req, res) {
       name: req.body.name,
       id: req.body.id,
       inputFormat: req.body.inputFormat,
-      outputformat: req.body.outputFormat,
+      outputFormat: req.body.outputFormat,
       constraints: req.body.constraints,
       sampleTestInput: req.body.sampleTestInput,
       sampleTestOutput: req.body.sampleTestOutput,
@@ -130,4 +154,4 @@ module.exports = {
   getQuestionByID,
   updateQuestion,
   deleteQuestion
-};
+};

api/models/ques.js

@@ -7,10 +7,8 @@ const quesSchema = new mongoose.Schema({
   inputFormat: [{ type: String }],
   outputFormat: [{ type: String }],
   constraints: [{ type: String, required: true }],
-  sampleTestInput: { type: String, required: true },
-  sampleTestOutput: { type: String, required: true },
-  timeLimit: { type: String, required: true },
-  sourceLimit: { type: String, required: true },
+  sampleTestInput: [{ type: String, required: true }],
+  sampleTestOutput: [{ type: String, required: true }],
   round: { type: Number, required: true },
   testCases: [{ type: mongoose.Schema.Types.ObjectId, ref: "Testcase" }],
 });

api/routes/questionsRouter.js

@@ -1,19 +1,22 @@
 const express = require("express");
 const router = express.Router();
+const {verifyAccessToken,verifyAdminToken} = require("../middleware/jwtMiddleware.js");
 
 const {
   createQuestion,
   getAll,
   getByRound,
   getQuestionByID,
   updateQuestion,
-  deleteQuestion,
+  deleteQuestion
 } = require("../controllers/questions");
 
-router.post("/createQues", createQuestion);
+router.use(verifyAccessToken)
+router.post("/createQues", verifyAdminToken, createQuestion); 
 router.get("/getOne", getAll);  
 router.post("/getId", getQuestionByID);
 router.post("/getRound", getByRound);
-router.put("/updateQuestion/:id", updateQuestion);
-router.delete("/deleteQuestion/:id",deleteQuestion);
-module.exports = router;
+router.put("/updateQuestion/:id", verifyAdminToken, updateQuestion);
+router.delete("/deleteQuestion/:id",verifyAdminToken, deleteQuestion);
+
+module.exports = router;