diff --git a/app/api/schemas/reset_pass_complete.py b/app/api/schemas/reset_pass_complete.py new file mode 100644 index 0000000..51fa752 --- /dev/null +++ b/app/api/schemas/reset_pass_complete.py @@ -0,0 +1,6 @@ +from marshmallow import Schema, fields + +class ResetPassComplete(Schema): + reset_token = fields.Str(required=True) + reset_uid = fields.Str(required=True) + new_password = fields.Str(required=True) diff --git a/app/api/schemas/reset_pass_verify.py b/app/api/schemas/reset_pass_verify.py new file mode 100644 index 0000000..397e5fe --- /dev/null +++ b/app/api/schemas/reset_pass_verify.py @@ -0,0 +1,4 @@ +from marshmallow import Schema, fields + +class ResetPassVerify(Schema): + reset_token = fields.Str(required=True) diff --git a/app/api/services/login.py b/app/api/services/login.py index 06b0315..2363dd6 100644 --- a/app/api/services/login.py +++ b/app/api/services/login.py @@ -12,7 +12,12 @@ from app.models import PasswordReset, Members from app.api.helpers.response_helper import ResponseHelper from werkzeug.security import generate_password_hash, check_password_hash from app.api.schemas.login import LoginSchema + from app.api.schemas.reset_pass_start import ResetPassStart +from app.api.schemas.reset_pass_verify import ResetPassVerify +from app.api.schemas.reset_pass_complete import ResetPassComplete + + import datetime import jwt import random @@ -68,8 +73,8 @@ class LoginService(BaseService): try: with db.session.begin(): - validated_data = LoginService.validate_data(data, ResetPassStart()) - username = validated_data.get('username') + validated_data = LoginService.validate_data(data, ResetPassVerify()) + reset_token = validated_data.get('reset_token') member = Members.get_member_by_username(username) if not member: invalid_data = { @@ -111,9 +116,13 @@ class LoginService(BaseService): try: with db.session.begin(): - validated_data = LoginService.validate_data(data, ResetPassStart()) - username = validated_data.get('username') - member = Members.get_member_by_username(username) + validated_data = LoginService.validate_data(data, ResetPassComplete()) + reset_token = validated_data.get('reset_token') + reset_uid = validated_data.get('reset_uid') + new_password = validated_data.get('new_password') + + member = Members.get_member_by_username(new_password) + if not member: invalid_data = { "error_message": "You will get email to continue the process if the account is valid", diff --git a/app/api/services/web_contents.py b/app/api/services/web_contents.py index 63d19c8..c777fe7 100644 --- a/app/api/services/web_contents.py +++ b/app/api/services/web_contents.py @@ -22,8 +22,10 @@ class WebContentsService(BaseService): "youtube": "myyou.youtube.com", "banner_text": "This is the main business text on the web page", "banner_description": "Naira", - "footer_description": "Any text under the loogo on the footer", - "about_description": "Naira" + "footer_description": "Any text under the logo on the footer", + "about_description": "Naira", + "banner_text": "AMEYE01 marketing that drives results for your business", + "banner_description": "Mauris donec ociis magnis sapien ipsum sagittis sapien tempor and volute gravida aliquet quaerat vitae" } return web_contents_data