added RequestValidator

api/RequestValidator.py

+from flask import jsonify
+
+
+class ValidationError(Exception):
+    def __init__(self, message):
+        super().__init__(message)
+        self.response = jsonify({"msg": message})
+
+
+class RequestValidator:
+
+    @staticmethod
+    def validate(request, parameters):
+        if not request.is_json:
+            raise ValidationError("Missing JSON in request")
+
+        result = {}
+        for param in parameters:
+            value = request.json.get(param, None)
+            if value is None:
+                raise ValidationError("Missing parameter '{}'".format(param))
+            result[param] = value
+
+        return result

api/RoadmapAPIServer.py

@@ -8,6 +8,7 @@ from flask_jwt_extended import (
 )
 from gevent.pywsgi import WSGIServer
 
+from RequestValidator import RequestValidator, ValidationError
 from blueprints import SubTaskAPI, MilestoneAPI, TaskAPI, RoadmapAPI
 from Database import Database
 from UserService import UserService
@@ -32,21 +33,19 @@ def index():
 
 @app.route('/login', methods=['POST'])
 def login():
-    if not request.is_json:
-        return jsonify({"msg": "Missing JSON in request"}), 400
+    try:
+        parameters = RequestValidator.validate(request, ["username", "password"])
+    except ValidationError as e:
+        return e.response, 400
 
-    username = request.json.get('username', None)
-    password = request.json.get('password', None)
-    if username is None:
-        return jsonify({"msg": "Missing username parameter"}), 400
+    password = userService.get_password_by_username(parameters["username"])
     if password is None:
-        return jsonify({"msg": "Missing password parameter"}), 400
+        return jsonify({"msg": "Unknown username"}), 401
 
-    user = userService.get_password_by_username(username)
-    if user is None:
-        return jsonify({"msg": "Bad username or password"}), 401
+    if password != parameters["password"]:
+        return jsonify({"msg": "Bad credentials"}), 401
 
-    access_token = create_access_token(identity=username)
+    access_token = create_access_token(identity=parameters["username"])
     return jsonify(access_token=access_token), 200
 
 

api/blueprints/RoadmapAPI.py

@@ -55,4 +55,11 @@ def construct_blueprint(database):
         roadmap["numberOfOpenMilestones"] = numberOfOpenMilestones
         return jsonify(roadmap)
 
+    @roadmap_api.route('/roadmap', methods=['POST'])
+    def add_roadmap():
+        database.add_roadmap()
+
+
+        return True
+
     return roadmap_api