Commit 98bb3639 authored by deepdey's avatar deepdey

refactor: reconstrct application

parent 97676091
from flask import Flask from flask import Flask
from flask_cors import CORS from flask_cors import CORS
from flask_jwt_extended import JWTManager
from flask_bcrypt import Bcrypt from flask_bcrypt import Bcrypt
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from app.app_config.config import DB_URI, JWT_SECRET_KEY from app.app_config.config import DB_URI
...@@ -15,12 +14,8 @@ cors: CORS = CORS(app, resources={r'/*': {'origins': '*'}}) ...@@ -15,12 +14,8 @@ cors: CORS = CORS(app, resources={r'/*': {'origins': '*'}})
# db configuration # db configuration
app.config['SQLALCHEMY_DATABASE_URI'] = DB_URI app.config['SQLALCHEMY_DATABASE_URI'] = DB_URI
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
app.config['JWT_SECRET_KEY'] = JWT_SECRET_KEY
app.config['JWT_TOKEN_LOCATION'] = ['headers']
app.config['JWT_HEADER_TYPE'] = 'Bearer'
db: SQLAlchemy = SQLAlchemy(app) db: SQLAlchemy = SQLAlchemy(app)
jwt = JWTManager(app)
# IMPORTANT: BCRYPT IS USED FOR HASHING THE PASSWORD ONLY AS IT IS CPU INTENSIVE # IMPORTANT: BCRYPT IS USED FOR HASHING THE PASSWORD ONLY AS IT IS CPU INTENSIVE
......
ALPHANUMARIC_STRING: str = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
\ No newline at end of file
from app.orm.user_orm import * from app.orm.user_orm import *
from app.orm.role_orm import * from app.orm.api_orm import *
from app.orm.role_type_orm import * from app.orm.role_type_orm import *
from app.orm.role_orm import *
from app.orm.user_role_map_orm import *
from app.orm.role_api_map_orm import *
...@@ -22,3 +22,5 @@ class Role(db.Model, SerializerMixin): ...@@ -22,3 +22,5 @@ class Role(db.Model, SerializerMixin):
created_at = db.Column(db.DATETIME, default=datetime.now) created_at = db.Column(db.DATETIME, default=datetime.now)
updated_at = db.Column(db.DATETIME, onupdate=datetime.now) updated_at = db.Column(db.DATETIME, onupdate=datetime.now)
is_deleted = db.Column(db.Boolean, default=False) is_deleted = db.Column(db.Boolean, default=False)
role_type = db.relationship('RoleType')
...@@ -28,6 +28,6 @@ class User(db.Model, SerializerMixin): ...@@ -28,6 +28,6 @@ class User(db.Model, SerializerMixin):
updated_at = db.Column(db.DATETIME, onupdate=datetime.now) updated_at = db.Column(db.DATETIME, onupdate=datetime.now)
is_deleted = db.Column(db.Boolean, default=False) is_deleted = db.Column(db.Boolean, default=False)
# user_roles = db.relationship('Role') user_roles = db.relationship('UserRoleMap')
serialize_rules = ('-password',) serialize_rules = ('-password',)
...@@ -17,4 +17,6 @@ class UserRoleMap(db.Model, SerializerMixin): ...@@ -17,4 +17,6 @@ class UserRoleMap(db.Model, SerializerMixin):
role_id = db.Column(db.BigInteger, db.ForeignKey('role.id')) role_id = db.Column(db.BigInteger, db.ForeignKey('role.id'))
created_at = db.Column(db.DATETIME, default=datetime.now) created_at = db.Column(db.DATETIME, default=datetime.now)
updated_at = db.Column(db.DATETIME, onupdate=datetime.now) updated_at = db.Column(db.DATETIME, onupdate=datetime.now)
\ No newline at end of file
role = db.relationship('Role')
\ No newline at end of file
...@@ -5,6 +5,7 @@ from flask import request ...@@ -5,6 +5,7 @@ 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.decorators.sanitizer import sanitized from app.decorators.sanitizer import sanitized
...@@ -31,7 +32,7 @@ ns = api.namespace( ...@@ -31,7 +32,7 @@ ns = api.namespace(
class Login(Resource): class Login(Resource):
def generate_api_key(self) -> str: def generate_api_key(self) -> str:
return ''.join(secrets.choice('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz') for _ in range(18)) 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())
...@@ -44,6 +45,8 @@ class Login(Resource): ...@@ -44,6 +45,8 @@ class Login(Resource):
email: str = payload['email'] email: str = payload['email']
password: str = payload['password'] password: str = payload['password']
# hashed_password = bcrypt.generate_password_hash(password).decode('utf-8')
user_info: ORM.User | None = get_user_by_email(email) user_info: ORM.User | None = get_user_by_email(email)
if (not user_info): if (not user_info):
...@@ -51,6 +54,8 @@ class Login(Resource): ...@@ -51,6 +54,8 @@ 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')
# fetch user role info
api_key = self.generate_api_key() api_key = self.generate_api_key()
......
from typing import List
from app import orm as ORM from app import orm as ORM
from app import db
def get_user_by_username(username: str) -> ORM.User | None: def get_user_by_username(username: str) -> ORM.User | None:
return ORM.User.query.filter_by( return ORM.User.query.filter_by(username=username, is_deleted=False).first()
username=username, is_deleted=False).first()
def get_user_by_email(email: str) -> ORM.User | None:
return ORM.User.query.filter_by(
email=email, is_deleted=False).first()
def get_user_by_email(email: str) -> ORM.User | None:
return ORM.User.query.filter_by(email=email, is_deleted=False).first()
...@@ -4,11 +4,8 @@ from app.routes import api ...@@ -4,11 +4,8 @@ from app.routes import api
def login_payload() -> list: def login_payload() -> list:
payload = api.model('login Payload', { payload = api.model(
'email': fields.String, 'login Payload', {'email': fields.String, 'password': fields.String}
'password': fields.String )
})
return [payload] return [payload]
...@@ -5,22 +5,7 @@ from flask_restx import fields ...@@ -5,22 +5,7 @@ from flask_restx import fields
from app.utils.api_response import prepare_swagger_response from app.utils.api_response import prepare_swagger_response
USER_RESPONSE_MODEL: any = api.model('user', { LOGIN_RESPONSE_MODEL: any = api.model('login Data', {'apiKey': fields.String})
'id': fields.Integer,
'username': fields.String,
'first_name': fields.String,
'last_name': fields.String,
'password': fields.String,
'phone': fields.String,
'email': fields.String,
'gender': fields.String,
'active': fields.Boolean,
'date_of_join': fields.Integer(description='date in epoch format'),
})
JWT_RESPONSE_MODEL: any = api.model('jwt Data', {
'jwt': fields.String
})
def login_response() -> any: def login_response() -> any:
...@@ -28,6 +13,5 @@ def login_response() -> any: ...@@ -28,6 +13,5 @@ def login_response() -> any:
code=SUCCESS_CODE, code=SUCCESS_CODE,
message=SUCCESS_MESSAGE, message=SUCCESS_MESSAGE,
model_name='login Response', model_name='login Response',
data=fields.Nested(JWT_RESPONSE_MODEL) data=fields.Nested(LOGIN_RESPONSE_MODEL),
) )
# from app.enum.user_role_enum import USER_ROLE
from marshmallow import Schema, fields, validate from marshmallow import Schema, fields, validate
class LoginValidator(Schema): class LoginValidator(Schema):
email = fields.String(required=True) email = fields.String(required=True)
password = fields.String(required=True) password = fields.String(required=True)
# class AddUserValidator(Schema):
# username = fields.String(required=True)
# first_name = fields.String(required=True)
# last_name = fields.String(required=True)
# password = fields.String(required=True, validate=validate.Length(min=6, max=32))
# phone = fields.String(required=True, validate=validate.Regexp(r'^[0-9]{10}$'))
# email = fields.String(required=True, validate=validate.Email())
# gender = fields.String(required=True)
# active = fields.Boolean(required=True)
# date_of_join = fields.Integer(required=True)
# roles = fields.List(
# fields.String(
# required=True,
# validate=validate.OneOf(USER_ROLE.get_list()),
# ),
# required=True,
# validate=validate.Length(min=1),
# )
# class UpdateUserValidator(Schema):
# id = fields.Integer(required=True, validate=validate.Range(min=1))
# first_name = fields.String(required=True)
# last_name = fields.String(required=True)
# password = fields.String(required=True, validate=validate.Length(min=6, max=32))
# phone = fields.String(required=True, validate=validate.Regexp(r'^[0-9]{10}$'))
# gender = fields.String(required=True)
# active = fields.Boolean(required=True)
# date_of_join = fields.Integer(required=True)
# class GetUserValidator(Schema):
# id = fields.Integer(required=True, validate=validate.Range(min=1))
from flask import Request
def get_my_ip(request: Request) -> str:
ip_address: str = request.environ.get('HTTP_X_FORWARDED_FOR')
if ip_address is None:
ip_address = request.environ['REMOTE_ADDR']
return ip_address
\ No newline at end of file
from datetime import datetime
from decimal import Decimal
def model_to_dict(self):
result: dict = {}
for column in self.__table__.columns:
value = getattr(self, column.name)
if isinstance(value, datetime):
value = value.isoformat()
if isinstance(value, Decimal):
value = float(value)
result[column.name] = value
return result
\ No newline at end of file
...@@ -2,7 +2,7 @@ import redis ...@@ -2,7 +2,7 @@ import redis
from app.app_config.config import REDIS_HOST, REDIS_PORT, REDIS_DATABASE from app.app_config.config import REDIS_HOST, REDIS_PORT, REDIS_DATABASE
def get_client(host, port, password): def get_client(host: str, port: int, password: str) -> redis.Redis | None:
try: try:
redis_client = redis.Redis(host=host, port=port, db=REDIS_DATABASE) redis_client = redis.Redis(host=host, port=port, db=REDIS_DATABASE)
return redis_client return redis_client
...@@ -11,7 +11,7 @@ def get_client(host, port, password): ...@@ -11,7 +11,7 @@ def get_client(host, port, password):
return None return None
def get_value(key): def get_value(key: str) -> str | None:
try: try:
client = get_client(REDIS_HOST, REDIS_PORT, None) client = get_client(REDIS_HOST, REDIS_PORT, None)
val = client.get(str(key)) val = client.get(str(key))
...@@ -21,11 +21,11 @@ def get_value(key): ...@@ -21,11 +21,11 @@ def get_value(key):
return None return None
def set_value(key,value): def set_value(key: str,value: str) -> bool:
try: try:
client = get_client(REDIS_HOST, REDIS_PORT, None) client = get_client(REDIS_HOST, REDIS_PORT, None)
client.set(key, value) client.set(key, value)
return True return True
except Exception as e: except Exception as e:
print(e) print(e)
return None return False
\ No newline at end of file \ No newline at end of file
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