mirror of
https://github.com/veops/cmdb.git
synced 2025-08-08 15:07:55 +08:00
upgrade flask to 2.3.2 and replace g.user with current_user
This commit is contained in:
@@ -10,6 +10,7 @@ from flask import current_app
|
||||
from flask import g
|
||||
from flask import request
|
||||
from flask import session
|
||||
from flask_login import current_user
|
||||
from flask_login import login_user
|
||||
|
||||
from api.lib.perm.acl.acl import ACLManager
|
||||
@@ -65,7 +66,7 @@ def _auth_with_key():
|
||||
|
||||
def _auth_with_session():
|
||||
if isinstance(getattr(g, 'user', None), User):
|
||||
login_user(g.user)
|
||||
login_user(current_user)
|
||||
return True
|
||||
if "acl" in session and "userName" in (session["acl"] or {}):
|
||||
login_user(UserCache.get(session["acl"]["userName"]))
|
||||
|
Reference in New Issue
Block a user