Commit 2fb82414 authored by Pratik Shrivastava's avatar Pratik Shrivastava

refactor: make generate_api_key() a generic function in utils

parent d1c917f5
...@@ -6,7 +6,6 @@ from flask import request ...@@ -6,7 +6,6 @@ from flask import request
from flask_restx import Resource from flask_restx import Resource
from marshmallow import ValidationError from marshmallow import ValidationError
from app.app_config.config import get_logger from app.app_config.config import get_logger
from app.app_config.constant import ALPHANUMARIC_STRING
from app.app_config.response_code import * from app.app_config.response_code import *
from app.app_config.response_message import * from app.app_config.response_message import *
from app.app_config.swagger_config import SECURITY from app.app_config.swagger_config import SECURITY
...@@ -18,7 +17,7 @@ from app import bcrypt ...@@ -18,7 +17,7 @@ from app import bcrypt
from app.routes.user.user_payload import * from app.routes.user.user_payload import *
from app.routes.user.user_response import * from app.routes.user.user_response import *
from app.routes.user.user_dao_service import * from app.routes.user.user_dao_service import *
from app.routes.user.user_util import process_valid_loging, generate_otp from app.routes.user.user_util import process_valid_loging, generate_otp, generate_api_key
from app.routes.user.user_validator import * from app.routes.user.user_validator import *
from app.utils.api_response import prepare_api_response from app.utils.api_response import prepare_api_response
from app.utils.mail_service import send_otp from app.utils.mail_service import send_otp
...@@ -36,9 +35,6 @@ ns = api.namespace( ...@@ -36,9 +35,6 @@ ns = api.namespace(
@ns.route('/login', methods=['POST']) @ns.route('/login', methods=['POST'])
class Login(Resource): class Login(Resource):
def generate_api_key(self) -> str:
return ''.join(secrets.choice(ALPHANUMARIC_STRING) for _ in range(18))
@ns.expect(*login_payload()) @ns.expect(*login_payload())
@ns.response(*login_response()) @ns.response(*login_response())
@sanitized() @sanitized()
...@@ -60,7 +56,7 @@ class Login(Resource): ...@@ -60,7 +56,7 @@ class Login(Resource):
if not bcrypt.check_password_hash(user_info.password, password): if not bcrypt.check_password_hash(user_info.password, password):
return prepare_api_response(401, 'Invalid password') return prepare_api_response(401, 'Invalid password')
api_key = self.generate_api_key() api_key = generate_api_key()
process_valid_loging(user_info, api_key) process_valid_loging(user_info, api_key)
return prepare_api_response( return prepare_api_response(
...@@ -127,9 +123,6 @@ class LoginOTP(Resource): ...@@ -127,9 +123,6 @@ class LoginOTP(Resource):
@ns.route('/login-otp-verify', methods=['POST']) @ns.route('/login-otp-verify', methods=['POST'])
class LoginOTPVerify(Resource): class LoginOTPVerify(Resource):
def generate_api_key(self) -> str:
return ''.join(secrets.choice(ALPHANUMARIC_STRING) for _ in range(18))
@ns.expect(*otp_verify_payload()) @ns.expect(*otp_verify_payload())
@ns.response(*otp_verify_response()) @ns.response(*otp_verify_response())
@sanitized() @sanitized()
...@@ -154,7 +147,7 @@ class LoginOTPVerify(Resource): ...@@ -154,7 +147,7 @@ class LoginOTPVerify(Resource):
raise Exception ('OTP is invalid.') raise Exception ('OTP is invalid.')
api_key = self.generate_api_key() api_key = generate_api_key()
process_valid_loging(user_info, api_key) process_valid_loging(user_info, api_key)
return prepare_api_response( return prepare_api_response(
......
...@@ -4,6 +4,7 @@ from typing import List ...@@ -4,6 +4,7 @@ from typing import List
from app import orm as ORM from app import orm as ORM
from app.utils.redis import set_value from app.utils.redis import set_value
from app import db from app import db
from app.app_config.constant import ALPHANUMARIC_STRING
def process_valid_loging(user_info: ORM.User, api_key: str) -> None: def process_valid_loging(user_info: ORM.User, api_key: str) -> None:
...@@ -46,3 +47,7 @@ def process_valid_loging(user_info: ORM.User, api_key: str) -> None: ...@@ -46,3 +47,7 @@ def process_valid_loging(user_info: ORM.User, api_key: str) -> None:
def generate_otp() -> str: def generate_otp() -> str:
return ''.join(secrets.choice(string.digits) for _ in range(6)) return ''.join(secrets.choice(string.digits) for _ in range(6))
def generate_api_key() -> str:
return ''.join(secrets.choice(ALPHANUMARIC_STRING) for _ in range(18))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment