Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at 23.05 45 lines 1.6 kB view raw
1diff --git a/flask_appbuilder/security/api.py b/flask_appbuilder/security/api.py 2index 2e2dfd612..df1bd5a25 100644 3--- a/flask_appbuilder/security/api.py 4+++ b/flask_appbuilder/security/api.py 5@@ -3,7 +3,7 @@ 6 create_access_token, 7 create_refresh_token, 8 get_jwt_identity, 9- jwt_refresh_token_required, 10+ jwt_required, 11 ) 12 13 from ..api import BaseApi, safe 14@@ -118,7 +118,7 @@ def login(self): 15 return self.response(200, **resp) 16 17 @expose("/refresh", methods=["POST"]) 18- @jwt_refresh_token_required 19+ @jwt_required(refresh=True) 20 @safe 21 def refresh(self): 22 """ 23diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py 24index fe7697007..3b22ab255 100644 25--- a/flask_appbuilder/security/manager.py 26+++ b/flask_appbuilder/security/manager.py 27@@ -297,7 +297,7 @@ def create_jwt_manager(self, app) -> JWTManager: 28 """ 29 jwt_manager = JWTManager() 30 jwt_manager.init_app(app) 31- jwt_manager.user_loader_callback_loader(self.load_user_jwt) 32+ jwt_manager.user_lookup_loader(self.load_user_jwt) 33 return jwt_manager 34 35 def create_builtin_roles(self): 36@@ -1944,7 +1944,8 @@ def del_permission_role(self, role, perm_view): 37 def load_user(self, pk): 38 return self.get_user_by_id(int(pk)) 39 40- def load_user_jwt(self, pk): 41+ def load_user_jwt(self, _jwt_header, jwt_data): 42+ pk = jwt_data["sub"] 43 user = self.load_user(pk) 44 # Set flask g.user to JWT user, we can't do it on before request 45 g.user = user