update funtion saving for request route template
This commit is contained in:
@@ -47,7 +47,7 @@ async def login(request: Request,db:Session= Depends(get_db) ,form_data: OAuth2P
|
|||||||
expires_delta=access_token_expires,
|
expires_delta=access_token_expires,
|
||||||
)
|
)
|
||||||
|
|
||||||
request.state.user = user
|
request.state.user = user.id
|
||||||
|
|
||||||
return JSONResponse(
|
return JSONResponse(
|
||||||
status_code=200,
|
status_code=200,
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ async def get_current_user(request: Request,security_scopes: SecurityScopes,
|
|||||||
user = userService.get_user(db, token_data.id)
|
user = userService.get_user(db, token_data.id)
|
||||||
if user is None:
|
if user is None:
|
||||||
raise credentials_exception
|
raise credentials_exception
|
||||||
request.state.user = user
|
request.state.user = user.id
|
||||||
return user
|
return user
|
||||||
|
|
||||||
async def get_current_active_user(
|
async def get_current_active_user(
|
||||||
|
|||||||
@@ -37,13 +37,18 @@ class LoggingMiddleware(BaseHTTPMiddleware):
|
|||||||
async def log_request(self, request: Request, response,state):
|
async def log_request(self, request: Request, response,state):
|
||||||
try:
|
try:
|
||||||
headers = dict(request.headers)
|
headers = dict(request.headers)
|
||||||
|
route = request.scope.get("route")
|
||||||
|
if route:
|
||||||
|
path_template = route.path
|
||||||
|
else:
|
||||||
|
path_template = request.url.path
|
||||||
|
|
||||||
db_operation = OperationLog(tenantid =request.state.tenant,
|
db_operation = OperationLog(tenantid =request.state.tenant,
|
||||||
clientip = request.client.host if request.client else None,
|
clientip = request.client.host if request.client else None,
|
||||||
useragent =headers.get("user-agent", ""),
|
useragent =headers.get("user-agent", ""),
|
||||||
userid = request.state.user.id,
|
userid = request.state.user,
|
||||||
operation = request.method,
|
operation = request.method,
|
||||||
function = request.url.path,
|
function = path_template,
|
||||||
parameters = str({"path": request.path_params,"query": dict(request.query_params),"body": request.state.body}),
|
parameters = str({"path": request.path_params,"query": dict(request.query_params),"body": request.state.body}),
|
||||||
response = f"status_code:{response.status_code }" )
|
response = f"status_code:{response.status_code }" )
|
||||||
|
|
||||||
@@ -65,6 +70,6 @@ class LoggingMiddleware(BaseHTTPMiddleware):
|
|||||||
|
|
||||||
async def write_log_to_db(self, db_operation,db):
|
async def write_log_to_db(self, db_operation,db):
|
||||||
db.add(db_operation)
|
db.add(db_operation)
|
||||||
await db.commit()
|
db.commit()
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user