Merge branch 'master' into feat/action-btn-class

dpgaspar · Jan 21, 2025 · 1583cf7 · 1583cf7
2 parents b039d78 + 227f907
commit 1583cf7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/flask_appbuilder/baseviews.py b/flask_appbuilder/baseviews.py
@@ -1066,7 +1066,7 @@ def _get_list_widget(
         page=None,
         page_size=None,
         widgets=None,
-        **args,
+        **kwargs,
     ):
         """get joined base filter and current active filter for query"""
         widgets = widgets or {}
@@ -1100,6 +1100,7 @@ def _get_list_widget(
             actions=actions,
             filters=filters,
             modelview_name=self.__class__.__name__,
+            **kwargs,
         )
         return widgets
 
@@ -1162,7 +1163,7 @@ def get_init_inner_views(self):
     -----------------------------------------------------
     """
 
-    def _list(self):
+    def _list(self, **kwargs):
         """
         list function logic, override to implement different logic
         returns list and search widget
@@ -1182,6 +1183,7 @@ def _list(self):
             order_direction=order_direction,
             page=page,
             page_size=page_size,
+            **kwargs,
         )
         form = self.search_form.refresh()
         self.update_redirect()

diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py
@@ -229,6 +229,12 @@ def __init__(self, appbuilder):
         app.config.setdefault("AUTH_ROLES_MAPPING", {})
         app.config.setdefault("AUTH_ROLES_SYNC_AT_LOGIN", False)
         app.config.setdefault("AUTH_API_LOGIN_ALLOW_MULTIPLE_PROVIDERS", False)
+        app.config.setdefault(
+            "AUTH_DB_FAKE_PASSWORD_HASH_CHECK",
+            "scrypt:32768:8:1$wiDa0ruWlIPhp9LM$6e409d093e62ad54df2af895d0e125b05ff6cf6414"
+            "8350189ffc4bcc71286edf1b8ad94a442c00f890224bf2b32153d0750c89ee9"
+            "401e62f9dcee5399065e4e5",
+        )
 
         # LDAP Config
         if self.auth_type == AUTH_LDAP:
@@ -968,8 +974,7 @@ def auth_user_db(self, username, password):
         if user is None or (not user.is_active):
             # Balance failure and success
             check_password_hash(
-                "pbkdf2:sha256:150000$Z3t6fmj2$22da622d94a1f8118"
-                "c0976a03d2f18f680bfff877c9a965db9eedc51bc0be87c",
+                self.appbuilder.get_app.config["AUTH_DB_FAKE_PASSWORD_HASH_CHECK"],
                 "password",
             )
             log.info(LOGMSG_WAR_SEC_LOGIN_FAILED, username)

diff --git a/flask_appbuilder/views.py b/flask_appbuilder/views.py
@@ -831,9 +831,9 @@ def del_key(cls, k):
         k = cls.__name__ + "__" + k
         session.pop(k)
 
-    def _get_list_widget(self, **args):
+    def _get_list_widget(self, **kwargs):
         """get joined base filter and current active filter for query"""
-        widgets = super(CompactCRUDMixin, self)._get_list_widget(**args)
+        widgets = super(CompactCRUDMixin, self)._get_list_widget(**kwargs)
         session_form_widget = self.get_key("session_form_widget", None)
 
         form_widget = None