Skip to content
Snippets Groups Projects
Commit 7b117989 authored by Anton's avatar Anton
Browse files

use request.get_json() instead of request.form

parent 0b465daa
No related branches found
No related tags found
No related merge requests found
No preview for this file type
...@@ -8,7 +8,7 @@ import secrets ...@@ -8,7 +8,7 @@ import secrets
def hash_password(pw): def hash_password(pw):
hashed_pw = sha256_crypt.encrypt(pw) hashed_pw = sha256_crypt.hash(pw)
return hashed_pw return hashed_pw
...@@ -51,7 +51,7 @@ def is_signup_form_valid(data): ...@@ -51,7 +51,7 @@ def is_signup_form_valid(data):
return False return False
for field in data: for field in data:
if not (len(data[field].strip())): if not (len(str(data[field]).strip())):
# string is empty # string is empty
return False return False
...@@ -83,8 +83,9 @@ def hello_world(): ...@@ -83,8 +83,9 @@ def hello_world():
@app.route("/sign-in", methods=["POST"]) @app.route("/sign-in", methods=["POST"])
def sign_in(): def sign_in():
email = request.form["email"] data = request.get_json()
password = request.form["password"] email = data["email"]
password = data["password"]
if validate_user(email, password): if validate_user(email, password):
token = generate_token() token = generate_token()
...@@ -101,7 +102,8 @@ def sign_in(): ...@@ -101,7 +102,8 @@ def sign_in():
@app.route("/sign-up", methods=["POST"]) @app.route("/sign-up", methods=["POST"])
def sign_up(): def sign_up():
user_data = request.form user_data = request.get_json()
if not is_signup_form_valid(user_data): if not is_signup_form_valid(user_data):
return create_response( return create_response(
success=False, message="One or more fields are incorrect" success=False, message="One or more fields are incorrect"
...@@ -141,14 +143,15 @@ def change_password(): ...@@ -141,14 +143,15 @@ def change_password():
if user: if user:
email = user[0] email = user[0]
hashed_pw = user[1] hashed_pw = user[1]
if validate_password(request.form["oldPassword"], hashed_pw): data = request.get_json()
if validate_password(data["oldPassword"], hashed_pw):
if len(request.form["newPassword"]) < 6: if len(data["newPassword"]) < 6:
return create_response( return create_response(
success=False, message="Password must be at least 6 characters" success=False, message="Password must be at least 6 characters"
) )
hashed_password = hash_password(request.form["newPassword"]) hashed_password = hash_password(data["newPassword"])
database_helper.set_password(email, hashed_password) database_helper.set_password(email, hashed_password)
return create_response(success=True, message="Password has been changed") return create_response(success=True, message="Password has been changed")
...@@ -249,11 +252,12 @@ def post_message(): ...@@ -249,11 +252,12 @@ def post_message():
token = get_token() token = get_token()
current_user = get_user_by_token(token) current_user = get_user_by_token(token)
if current_user: if current_user:
data = request.get_json()
sender_email = current_user[0] sender_email = current_user[0]
database_helper.add_message( database_helper.add_message(
to_email=request.form["email"], to_email=data["email"],
from_email=sender_email, from_email=sender_email,
message=request.form["message"], message=data["message"],
) )
return create_response(success=True, message="Message sent") return create_response(success=True, message="Message sent")
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment