Skip to content
Snippets Groups Projects

Resolve "change password"

Merged Herman Andersen Dyrkorn requested to merge 25-change-password into master
1 file
+ 10
3
Compare changes
  • Side-by-side
  • Inline
+ 10
3
@@ -17,7 +17,7 @@ class UserEndpoint(Resource):
user = db.session.query(User).filter_by(email=data['email'].lower()).first()
if not user and re.search(EMAIL_REGEX, data['email'].lower()):
password_hash = bcrypt.generate_password_hash(data['password'])
new_user = User(name=data['name'].lower(), email=data['email'].lower(), pwd=password_hash)
new_user = User(name=data['name'], email=data['email'].lower(), pwd=password_hash)
db.session.add(new_user)
db.session.commit()
return jsonify({"message": "new user created", 'status': 200})
@@ -26,7 +26,7 @@ class UserEndpoint(Resource):
else:
return jsonify({"message": "password does not match", 'status': 400})
else:
return jsonify({"message": "wrong data posted", 'status': 200})
return jsonify({"message": "wrong data posted", 'status': 400})
@staticmethod
@jwt_required
@@ -62,7 +62,14 @@ class UserEndpoint(Resource):
db.session.commit()
return jsonify({"message": "email was updated", "status": 200})
if 'newPassword' in data and 'confirmNewPassword' in data:
if data['newPassword'] == data['confirmNewPassword']:
password_hash = bcrypt.generate_password_hash(data['newPassword'])
user.pwd = password_hash
db.session.commit()
return jsonify({"message": "email was updated", "status": 200})
else:
return jsonify({"message": "this user does not exist", "status": 200})
return jsonify({"message": "this user does not exist", "status": 400})
Loading