Commit 7ccdc95c authored by deepdey's avatar deepdey

feat: add user-role-map api

parent 4c494289
...@@ -29,7 +29,7 @@ logger = get_logger(__name__) ...@@ -29,7 +29,7 @@ logger = get_logger(__name__)
ns = api.namespace( ns = api.namespace(
name=os.path.dirname(__file__).split(os.sep)[-1].replace('_', '-'), name=os.path.dirname(__file__).split(os.sep)[-1].replace('_', '-'),
description='API connected to user module', description='API connected to user module',
ordered=False ordered=False,
) )
...@@ -54,7 +54,7 @@ class Login(Resource): ...@@ -54,7 +54,7 @@ class Login(Resource):
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:
return prepare_api_response(401, 'Invalid Email') return prepare_api_response(401, 'Invalid Email')
if not bcrypt.check_password_hash(user_info.password, password): if not bcrypt.check_password_hash(user_info.password, password):
...@@ -64,16 +64,14 @@ class Login(Resource): ...@@ -64,16 +64,14 @@ class Login(Resource):
process_valid_loging(user_info, api_key) process_valid_loging(user_info, api_key)
return prepare_api_response( return prepare_api_response(
SUCCESS_CODE, SUCCESS_CODE, SUCCESS_MESSAGE, data={'apiKey': api_key}
SUCCESS_MESSAGE,
data={'apiKey': api_key}
) )
except ValidationError as e: except ValidationError as e:
return prepare_api_response( return prepare_api_response(
VALIDATION_ERROR_CODE, VALIDATION_ERROR_CODE,
VALIDATION_ERROR_MESSAGE, VALIDATION_ERROR_MESSAGE,
error=e.normalized_messages() error=e.normalized_messages(),
) )
except Exception as e: except Exception as e:
...@@ -99,7 +97,7 @@ class LoginOTP(Resource): ...@@ -99,7 +97,7 @@ class LoginOTP(Resource):
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:
return prepare_api_response(401, 'Invalid Email') return prepare_api_response(401, 'Invalid Email')
otp: int = self.generate_otp() otp: int = self.generate_otp()
...@@ -109,17 +107,13 @@ class LoginOTP(Resource): ...@@ -109,17 +107,13 @@ class LoginOTP(Resource):
redis_key: str = str(user_info.id) + '_' + 'otp' + str(otp) redis_key: str = str(user_info.id) + '_' + 'otp' + str(otp)
set_value(redis_key, 1, 60 * 5) set_value(redis_key, 1, 60 * 5)
return prepare_api_response(SUCCESS_CODE, 'OTP generated successfully')
return prepare_api_response(
SUCCESS_CODE,
'OTP generated successfully'
)
except ValidationError as e: except ValidationError as e:
return prepare_api_response( return prepare_api_response(
VALIDATION_ERROR_CODE, VALIDATION_ERROR_CODE,
VALIDATION_ERROR_MESSAGE, VALIDATION_ERROR_MESSAGE,
error=e.normalized_messages() error=e.normalized_messages(),
) )
except Exception as e: except Exception as e:
...@@ -146,7 +140,7 @@ class LoginOTPVerify(Resource): ...@@ -146,7 +140,7 @@ class LoginOTPVerify(Resource):
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:
return prepare_api_response(401, 'Invalid Email') return prepare_api_response(401, 'Invalid Email')
redis_key: str = str(user_info.id) + '_' + 'otp' + str(provided_otp) redis_key: str = str(user_info.id) + '_' + 'otp' + str(provided_otp)
...@@ -154,23 +148,20 @@ class LoginOTPVerify(Resource): ...@@ -154,23 +148,20 @@ class LoginOTPVerify(Resource):
redis_otp: int | None = get_value(redis_key) redis_otp: int | None = get_value(redis_key)
if redis_otp is None: if redis_otp is None:
raise Exception ('OTP is invalid.') raise Exception('OTP is invalid.')
api_key = self.generate_api_key() api_key = self.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(
SUCCESS_CODE, SUCCESS_CODE, 'OTP Verified Successfully', data={'apiKey': api_key}
'OTP Verified Successfully',
data={'apiKey': api_key}
) )
except ValidationError as e: except ValidationError as e:
return prepare_api_response( return prepare_api_response(
VALIDATION_ERROR_CODE, VALIDATION_ERROR_CODE,
VALIDATION_ERROR_MESSAGE, VALIDATION_ERROR_MESSAGE,
error=e.normalized_messages() error=e.normalized_messages(),
) )
except Exception as e: except Exception as e:
...@@ -215,8 +206,9 @@ class GetUser(Resource): ...@@ -215,8 +206,9 @@ class GetUser(Resource):
validator = GetUserValidator() validator = GetUserValidator()
arguments: dict = validator.load(request.args) arguments: dict = validator.load(request.args)
user_info: ORM.User | None =\ user_info: ORM.User | None = get_user_by_id_for_admin(
get_user_by_id_for_admin(user_id, arguments['id']) user_id, arguments['id']
)
if not user_info: if not user_info:
return prepare_api_response(404, 'User not found') return prepare_api_response(404, 'User not found')
...@@ -252,7 +244,7 @@ class GetAllUsers(Resource): ...@@ -252,7 +244,7 @@ class GetAllUsers(Resource):
return prepare_api_response( return prepare_api_response(
SUCCESS_CODE, SUCCESS_CODE,
GET_ALL_SUCCESS_MESSAGE, GET_ALL_SUCCESS_MESSAGE,
data=[user.to_dict(rules=('-user_roles',)) for user in users_list] data=[user.to_dict(rules=('-user_roles',)) for user in users_list],
) )
except Exception as e: except Exception as e:
...@@ -260,4 +252,30 @@ class GetAllUsers(Resource): ...@@ -260,4 +252,30 @@ class GetAllUsers(Resource):
return prepare_api_response(EXCEPTION_CODE, str(e)) return prepare_api_response(EXCEPTION_CODE, str(e))
# TODO: implement forget password and registration api @ns.route('/map-role', methods=['GET'])
\ No newline at end of file class GetProfile(Resource):
@ns.doc(security=SECURITY)
@ns.expect(*map_user_role_payload())
@ns.response(*map_user_role_response())
@fetch_user()
@sanitized()
def get(self, user_id: int):
try:
validator = MapUserRoleValidator()
payload: dict = validator.load(request.args)
map_user_role(user_id, payload['user_id'], payload['role_id'])
return prepare_api_response(SUCCESS_CODE, 'Role mapped successfully')
except ValidationError as e:
return prepare_api_response(
VALIDATION_ERROR_CODE,
VALIDATION_ERROR_MESSAGE,
error=e.normalized_messages(),
)
except Exception as e:
logger.error(traceback.format_exc())
return prepare_api_response(EXCEPTION_CODE, str(e))
from typing import List from typing import List
from app import orm as ORM from app import orm as ORM
from app import db
from app.app_config.constant import RoleTypeEnum from app.app_config.constant import RoleTypeEnum
...@@ -25,7 +26,7 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None: ...@@ -25,7 +26,7 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
return ORM.User.query.filter( return ORM.User.query.filter(
ORM.User.is_deleted == False, ORM.User.is_deleted == False,
ORM.User.id == user_id, ORM.User.id == user_id,
ORM.User.project_id == admin_user.project_id ORM.User.project_id == admin_user.project_id,
).first() ).first()
else: else:
# return all user data for super admin # return all user data for super admin
...@@ -42,11 +43,47 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]: ...@@ -42,11 +43,47 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value: if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
return ORM.User.query.filter( return ORM.User.query.filter(
ORM.User.is_deleted == False, ORM.User.is_deleted == False, ORM.User.project_id == admin_user.project_id
ORM.User.project_id == admin_user.project_id
).all() ).all()
else: else:
# return all user data for super admin # return all user data for super admin
return ORM.User.query.filter( return ORM.User.query.filter(ORM.User.is_deleted == False).all()
ORM.User.is_deleted == False
).all()
def map_user_role(admin_id: int, user_id: int, role_id: int) -> None:
admin_user: ORM.User | None = get_user_by_id(admin_id)
if not admin_user:
raise Exception('User not found for mapped apiKey')
user_info: ORM.User | None = get_user_by_id(user_id)
if not user_info:
raise Exception('User not found for given user_id')
role_info: ORM.Role | None = ORM.Role.query.filter_by(id=role_id).first()
if not role_info:
raise Exception('Role not found for given role_id')
if user_info.role_type_id != role_info.role_type_id:
raise Exception('The role-type for user and role does not match')
if user_info.project_id != role_info.project_id:
raise Exception('This role cannot be mapped for this user')
if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
if user_info.project_id != admin_user.project_id:
raise Exception('You are not authorized to perform this action')
user_role_map = ORM.UserRoleMap.query.filter(
ORM.UserRoleMap.user_id == user_id
).first()
if user_role_map:
user_role_map.role_id = role_id
else:
user_role_map = ORM.UserRoleMap(user_id=user_id, role_id=role_id)
db.session.add(user_role_map)
db.session.commit()
...@@ -34,3 +34,11 @@ def get_user_payload() -> list: ...@@ -34,3 +34,11 @@ def get_user_payload() -> list:
parser.add_argument('id', required=True, type=int, location='args') parser.add_argument('id', required=True, type=int, location='args')
return [parser] return [parser]
def map_user_role_payload() -> list:
parser = api.parser()
parser.add_argument('user_id', required=True, type=int, location='args')
parser.add_argument('role_id', required=True, type=int, location='args')
return [parser]
\ No newline at end of file
...@@ -40,22 +40,25 @@ def login_response() -> any: ...@@ -40,22 +40,25 @@ def login_response() -> any:
return prepare_swagger_response( return prepare_swagger_response(
code=SUCCESS_CODE, code=SUCCESS_CODE,
message=SUCCESS_MESSAGE, message=SUCCESS_MESSAGE,
model_name='login OTP Response', model_name='loginOTP Response',
data=fields.Nested(LOGIN_RESPONSE_MODEL), data=fields.Nested(LOGIN_RESPONSE_MODEL),
) )
def otp_response() -> any: def otp_response() -> any:
return prepare_swagger_response( return prepare_swagger_response(
code=SUCCESS_CODE, code=SUCCESS_CODE,
message='OTP generated successfully', message='OTP generated successfully',
model_name='Verify OTP Response', model_name='VerifyOTP Response',
data=fields.Nested(LOGIN_RESPONSE_MODEL), data=fields.Nested(LOGIN_RESPONSE_MODEL),
) )
def otp_verify_response() -> any: def otp_verify_response() -> any:
return prepare_swagger_response( return prepare_swagger_response(
code=SUCCESS_CODE, code=SUCCESS_CODE,
message='OTP Verified Successfully', message='OTP Verified Successfully',
model_name='login OTP Verify Response', model_name='loginOTPVerify Response',
data=fields.Nested(LOGIN_RESPONSE_MODEL), data=fields.Nested(LOGIN_RESPONSE_MODEL),
) )
...@@ -68,9 +71,11 @@ def get_user_response() -> any: ...@@ -68,9 +71,11 @@ def get_user_response() -> any:
data=fields.Nested(USER_RESPONSE_MODEL), data=fields.Nested(USER_RESPONSE_MODEL),
) )
def get_user_profile_response() -> any: def get_user_profile_response() -> any:
return get_user_response() return get_user_response()
def get_user_list_response() -> any: def get_user_list_response() -> any:
return prepare_swagger_response( return prepare_swagger_response(
code=SUCCESS_CODE, code=SUCCESS_CODE,
...@@ -78,3 +83,11 @@ def get_user_list_response() -> any: ...@@ -78,3 +83,11 @@ def get_user_list_response() -> any:
model_name='getUserList Response', model_name='getUserList Response',
data=fields.List(fields.Nested(USER_RESPONSE_MODEL)), data=fields.List(fields.Nested(USER_RESPONSE_MODEL)),
) )
def map_user_role_response() -> any:
return prepare_swagger_response(
code=SUCCESS_CODE,
message='Role mapped Successfully',
model_name='roleMap Response'
)
\ No newline at end of file
...@@ -14,3 +14,7 @@ class OtpVerifyValidator(Schema): ...@@ -14,3 +14,7 @@ class OtpVerifyValidator(Schema):
class GetUserValidator(Schema): class GetUserValidator(Schema):
id = fields.Integer(required=True, validate=validate.Range(min=1)) id = fields.Integer(required=True, validate=validate.Range(min=1))
class MapUserRoleValidator(Schema):
user_id = fields.Integer(required=True, validate=validate.Range(min=1))
role_id = fields.Integer(required=True, validate=validate.Range(min=1))
\ 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