Merge pull request #754 from Lunatic-Labs/SKIL-517

SKIL-517
Lunatic-Labs · Nov 5, 2024 · 24684a2 · 24684a2
2 parents 83e13b3 + fe87e07
commit 24684a2
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 4 deletions.
diff --git a/BackEndFlask/controller/Routes/Bulk_upload_routes.py b/BackEndFlask/controller/Routes/Bulk_upload_routes.py
@@ -9,8 +9,13 @@
 import os
 import shutil
 from controller.Route_response import create_bad_response, create_good_response
+from flask_jwt_extended import jwt_required
+from controller.security.CustomDecorators import AuthCheck, bad_token_check
 
 @bp.route('/bulk_upload', methods = ['POST'])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def upload_CSV():
     try:
         file = request.files['csv_file']

diff --git a/BackEndFlask/controller/Routes/Checkin_routes.py b/BackEndFlask/controller/Routes/Checkin_routes.py
@@ -16,6 +16,9 @@
 CHECK_IN_REDIS_CHANNEL = "check_in_updated"
 
 @bp.route('/checkin', methods = ['POST'])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def checkin_user():
     # needs json with AT id, user id, and team id
     try:
@@ -40,6 +43,9 @@ def checkin_user():
         return create_bad_response(f"An error occurred checking in user: {e}", "checkin", 400)
 
 @bp.route('/checkin', methods = ['GET'])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def get_checked_in():
     # given an asessment task id, return checked in information
     try:

diff --git a/BackEndFlask/controller/Routes/Course_routes.py b/BackEndFlask/controller/Routes/Course_routes.py
@@ -57,6 +57,9 @@ def get_all_courses():
 
 
 @bp.route('/course', methods=['GET'])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def get_one_course():
     try:
         course_id = int(request.args.get("course_id"))

diff --git a/BackEndFlask/controller/Routes/Feedback_routes.py b/BackEndFlask/controller/Routes/Feedback_routes.py
@@ -2,9 +2,14 @@
 from controller import bp
 from controller.Route_response import *
 from datetime import datetime
+from flask_jwt_extended import jwt_required
+from controller.security.CustomDecorators import AuthCheck, bad_token_check
 
 
 @bp.route("/feedback", methods=["POST"])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def create_new_feedback():
     try:
         feedback_data = request.json

diff --git a/BackEndFlask/controller/Routes/Logout_route.py b/BackEndFlask/controller/Routes/Logout_route.py
@@ -2,7 +2,6 @@
 from controller import bp
 from controller.Route_response import *
 from controller.security.blacklist import blacklist_token
-from controller.security.CustomDecorators import AuthCheck, bad_token_check
 from controller.security.utility import(
     revoke_tokens,
     token_expired,

diff --git a/BackEndFlask/controller/Routes/Rating_routes.py b/BackEndFlask/controller/Routes/Rating_routes.py
@@ -5,8 +5,13 @@
 from controller.Route_response import *
 from models.completed_assessment import *
 from models.queries import get_individual_ratings
+from flask_jwt_extended import jwt_required
+from controller.security.CustomDecorators import AuthCheck, bad_token_check
 
 @bp.route("/rating", methods=["GET"])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def get_student_individual_ratings():
     """
         Description:
@@ -45,6 +50,9 @@ def get_student_individual_ratings():
 
 
 @bp.route("/rating", methods=["POST"])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def student_view_feedback(): 
     """
         Description:

diff --git a/BackEndFlask/controller/Routes/Refresh_route.py b/BackEndFlask/controller/Routes/Refresh_route.py
@@ -5,7 +5,6 @@
 from controller.Route_response import *
 from flask_jwt_extended import jwt_required, create_access_token
 from controller.security.CustomDecorators import AuthCheck, bad_token_check
-from controller.security.CustomDecorators import AuthCheck, bad_token_check
 
 @bp.route('/refresh', methods=['POST'])
 @jwt_required(refresh=True)

diff --git a/BackEndFlask/controller/Routes/Signup_route.py b/BackEndFlask/controller/Routes/Signup_route.py
@@ -3,7 +3,6 @@
 from models.user import get_user_by_email
 from controller.Route_response import *
 from controller.Routes.User_routes import UserSchema
-from controller.security.CustomDecorators import AuthCheck, bad_token_check
 
 @bp.route('/signup', methods=['POST'])
 def register_user():

diff --git a/BackEndFlask/controller/Routes/Team_bulk_upload_routes.py b/BackEndFlask/controller/Routes/Team_bulk_upload_routes.py
@@ -9,9 +9,13 @@
 from Functions import teamBulkUpload
 from Functions import customExceptions
 from controller.Route_response import *
-
+from flask_jwt_extended import jwt_required
+from controller.security.CustomDecorators import AuthCheck, bad_token_check
 
 @bp.route('/team_bulk_upload', methods=['POST'])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def upload_team_csv():
     try:
         file = request.files['csv_file']

diff --git a/BackEndFlask/controller/Routes/Team_routes.py b/BackEndFlask/controller/Routes/Team_routes.py
@@ -86,6 +86,9 @@ def get_one_team():
         return create_bad_response(f"An error occurred fetching a team: {e}", "teams", 400)
 
 @bp.route('/team/nonfull-adhoc', methods = ["GET"])
+@jwt_required()
+@bad_token_check()
+@AuthCheck()
 def get_nonfull_adhoc_teams():
     # given an assessment task id, return list of team ids that have not reached the max team size
     try: