diff --git a/app/api/routes/routes.py b/app/api/routes/routes.py index f5d2719..601391b 100644 --- a/app/api/routes/routes.py +++ b/app/api/routes/routes.py @@ -169,6 +169,14 @@ def myproduct_dash(): response = MyProductsService.process_request(data) return response +@api.route("/panel/myproduct/settings", methods=["POST"]) +def myproduct_settings(): + data = request.get_json() + logger.info(f"Route MyProduct Data ==>>>> {data}") + response = MyProductsService.process_settings(data) + return response + + # /panel/myproduct/subscription @api.route("/panel/myproduct/subscription", methods=["POST"]) def myproduct_subscription(): diff --git a/app/api/services/login.py b/app/api/services/login.py index cd170e7..4e429d5 100644 --- a/app/api/services/login.py +++ b/app/api/services/login.py @@ -141,18 +141,38 @@ class LoginService(BaseService): reset_uid = validated_data.get('reset_uid') new_password = validated_data.get('new_password') - member = Members.get_member_by_username(new_password) + logger.error("GOT HERE 000001 ") + data ={} + if not reset_token: + return jsonify({'message': 'Error - missing reset_token '}), 403 + try: + data = jwt.decode(reset_token, LoginService.JWT_SECRET_KEY, algorithms=["HS256"]) + except: + return jsonify({'status': 'INVALID2', 'message': 'Link is invalid'}), 403 + logger.error("GOT HERE 000002 ") + if not data: + invalid_data = { + "error_message": "The link is invalid please try again later", + "reset_message": "", + "message_key": "invalid_pass_reset_link", + } + return ResponseHelper.success(data=invalid_data) + + + user_data = data["user"] + reset_data = PasswordReset.get_rest_with_uid(user_data["pending_uid"]) + logger.error(f"GOT HERE 000003 {reset_data} id = {reset_data.id}") + username = user_data["username"] + member = Members.get_member_by_username(username) if not member: invalid_data = { - "error_message": "You will get email to continue the process if the account is valid", + "error_message": "Invalid User", "reset_message": "", - "message_key": "invalid_username_or_password", + "message_key": "invalid_user", } return ResponseHelper.success(data=invalid_data) - reset_data = PasswordReset.create_reset(username=username) - BaseService.send_resetpass_mail(member.email, str(member.uid), member.id, "FF", - "LL") # pending_uid, pending_id, firstname, lastname + response_data = { "error_message": "", diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index 91d56b5..ae6d074 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -150,6 +150,9 @@ class MyProductsService(BaseService): + @staticmethod + def process_settings(data): + pass