fix: _get_client_ip
This commit is contained in:
@@ -43,7 +43,7 @@ def create_module(
|
|||||||
description=f"Module '{result.module_name}' created",
|
description=f"Module '{result.module_name}' created",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
new_values=module_data.model_dump()
|
new_values=module_data.model_dump()
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
@@ -81,7 +81,7 @@ def update_module(
|
|||||||
description=f"Module '{result.module_name}' updated",
|
description=f"Module '{result.module_name}' updated",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
old_values=old_values,
|
old_values=old_values,
|
||||||
new_values=module_data.model_dump(exclude_unset=True)
|
new_values=module_data.model_dump(exclude_unset=True)
|
||||||
)
|
)
|
||||||
@@ -110,7 +110,7 @@ def delete_module(
|
|||||||
description=f"Module '{module_name}' deleted",
|
description=f"Module '{module_name}' deleted",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request)
|
ip_address=get_client_ip(request)
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ def assign_module_to_tenant(
|
|||||||
description=f"Module assigned to tenant {tenant_id}",
|
description=f"Module assigned to tenant {tenant_id}",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
new_values=assignment_data.model_dump(mode='json')
|
new_values=assignment_data.model_dump(mode='json')
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
@@ -66,7 +66,7 @@ def update_tenant_module(
|
|||||||
description=f"Tenant module assignment updated",
|
description=f"Tenant module assignment updated",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
new_values=update_data.model_dump(exclude_unset=True)
|
new_values=update_data.model_dump(exclude_unset=True)
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
@@ -91,6 +91,6 @@ def remove_module_from_tenant(
|
|||||||
description=f"Tenant module assignment deleted",
|
description=f"Tenant module assignment deleted",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
@@ -39,7 +39,7 @@ def create_role(
|
|||||||
description=f"Role '{result.role_name}' created",
|
description=f"Role '{result.role_name}' created",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
new_values={
|
new_values={
|
||||||
"role_name": result.role_name,
|
"role_name": result.role_name,
|
||||||
"tenant_id": str(result.tenant_id) if result.tenant_id else None,
|
"tenant_id": str(result.tenant_id) if result.tenant_id else None,
|
||||||
@@ -95,7 +95,7 @@ def update_role(
|
|||||||
description=f"Role '{result.role_name}' updated",
|
description=f"Role '{result.role_name}' updated",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
old_values=old_values,
|
old_values=old_values,
|
||||||
new_values=new_values
|
new_values=new_values
|
||||||
)
|
)
|
||||||
@@ -125,7 +125,7 @@ def delete_role(
|
|||||||
description=f"Role '{result.role_name}' deleted",
|
description=f"Role '{result.role_name}' deleted",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
old_values={"role_name": role_name}
|
old_values={"role_name": role_name}
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ def create_tenant(
|
|||||||
description=f"Tenant '{result.tenant_name}' onboarded",
|
description=f"Tenant '{result.tenant_name}' onboarded",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
new_values=tenant_data.model_dump(mode='json')
|
new_values=tenant_data.model_dump(mode='json')
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
@@ -92,7 +92,7 @@ def update_tenant(
|
|||||||
description=f"Tenant '{result.tenant_name}' updated",
|
description=f"Tenant '{result.tenant_name}' updated",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
old_values=old_values,
|
old_values=old_values,
|
||||||
new_values=new_values
|
new_values=new_values
|
||||||
)
|
)
|
||||||
@@ -122,7 +122,7 @@ def delete_tenant(
|
|||||||
description=f"Tenant '{existing.tenant_name}' removed",
|
description=f"Tenant '{existing.tenant_name}' removed",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
old_values={"tenant_name": existing.tenant_name, "domain": existing.tenant_domain}
|
old_values={"tenant_name": existing.tenant_name, "domain": existing.tenant_domain}
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ def create_user(
|
|||||||
description=f"User '{result.email}' created",
|
description=f"User '{result.email}' created",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
new_values={
|
new_values={
|
||||||
"email": result.email,
|
"email": result.email,
|
||||||
"tenant_id": str(result.tenant_id) if result.tenant_id else None,
|
"tenant_id": str(result.tenant_id) if result.tenant_id else None,
|
||||||
@@ -82,7 +82,7 @@ def update_user(
|
|||||||
description=f"User '{result.email}' updated",
|
description=f"User '{result.email}' updated",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
old_values=old_values,
|
old_values=old_values,
|
||||||
new_values=user_data.model_dump(mode='json', exclude_unset=True)
|
new_values=user_data.model_dump(mode='json', exclude_unset=True)
|
||||||
)
|
)
|
||||||
@@ -111,7 +111,7 @@ def delete_user(
|
|||||||
description=f"User '{user_email}' deleted",
|
description=f"User '{user_email}' deleted",
|
||||||
performed_by_id=str(current_user.id),
|
performed_by_id=str(current_user.id),
|
||||||
performed_by_email=current_user.email,
|
performed_by_email=current_user.email,
|
||||||
ip_address=_get_client_ip(request),
|
ip_address=get_client_ip(request),
|
||||||
old_values={"email": user_email}
|
old_values={"email": user_email}
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
|
|||||||
Reference in New Issue
Block a user