Skip to content

Commit beab5b5

Browse files
black linting fixes
1 parent 9e3564e commit beab5b5

File tree

5 files changed

+48
-16
lines changed

5 files changed

+48
-16
lines changed

flask_appbuilder/security/manager.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,12 @@ def reset_password(self, userid, password):
952952
user = self.get_user_by_id(userid)
953953
user.password = generate_password_hash(
954954
password=password,
955-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
956-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
955+
method=self.appbuilder.get_app.config.get(
956+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
957+
),
958+
salt_length=self.appbuilder.get_app.config.get(
959+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
960+
),
957961
)
958962
self.update_user(user)
959963

flask_appbuilder/security/mongoengine/manager.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,12 @@ def add_register_user(
9696
else:
9797
register_user.password = generate_password_hash(
9898
password=password,
99-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
100-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
99+
method=self.appbuilder.get_app.config.get(
100+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
101+
),
102+
salt_length=self.appbuilder.get_app.config.get(
103+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
104+
),
101105
)
102106
register_user.registration_hash = str(uuid.uuid1())
103107
register_user.save()
@@ -147,8 +151,12 @@ def add_user(
147151
else:
148152
user.password = generate_password_hash(
149153
password=password,
150-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
151-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
154+
method=self.appbuilder.get_app.config.get(
155+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
156+
),
157+
salt_length=self.appbuilder.get_app.config.get(
158+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
159+
),
152160
)
153161
user.save()
154162
log.info(c.LOGMSG_INF_SEC_ADD_USER, username)

flask_appbuilder/security/sqla/apis/user/api.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,23 @@ def pre_update(self, item):
7171
if item.password:
7272
item.password = generate_password_hash(
7373
password=item.password,
74-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
75-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
74+
method=self.appbuilder.get_app.config.get(
75+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
76+
),
77+
salt_length=self.appbuilder.get_app.config.get(
78+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
79+
),
7680
)
7781

7882
def pre_add(self, item):
7983
item.password = generate_password_hash(
8084
password=item.password,
81-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
82-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
85+
method=self.appbuilder.get_app.config.get(
86+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
87+
),
88+
salt_length=self.appbuilder.get_app.config.get(
89+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
90+
),
8391
)
8492

8593
@expose("/", methods=["POST"])

flask_appbuilder/security/sqla/manager.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,12 @@ def add_register_user(
143143
else:
144144
register_user.password = generate_password_hash(
145145
password=password,
146-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
147-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
146+
method=self.appbuilder.get_app.config.get(
147+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
148+
),
149+
salt_length=self.appbuilder.get_app.config.get(
150+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
151+
),
148152
)
149153
register_user.registration_hash = str(uuid.uuid1())
150154
try:
@@ -240,8 +244,12 @@ def add_user(
240244
else:
241245
user.password = generate_password_hash(
242246
password=password,
243-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
244-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
247+
method=self.appbuilder.get_app.config.get(
248+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
249+
),
250+
salt_length=self.appbuilder.get_app.config.get(
251+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
252+
),
245253
)
246254
self.get_session.add(user)
247255
self.get_session.commit()

flask_appbuilder/security/views.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,12 @@ def pre_update(self, item: Any) -> None:
448448
def pre_add(self, item: Any) -> None:
449449
item.password = generate_password_hash(
450450
password=item.password,
451-
method=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_METHOD', 'scrypt'),
452-
salt_length=self.appbuilder.get_app.config.get('FAB_PASSWORD_HASH_SALT_LENGTH', 16),
451+
method=self.appbuilder.get_app.config.get(
452+
"FAB_PASSWORD_HASH_METHOD", "scrypt"
453+
),
454+
salt_length=self.appbuilder.get_app.config.get(
455+
"FAB_PASSWORD_HASH_SALT_LENGTH", 16
456+
),
453457
)
454458

455459

0 commit comments

Comments
 (0)