File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -3334,13 +3334,17 @@ async fn put_reset_password_enrollment(
3334
3334
3335
3335
let reset_request = data. into_inner ( ) ;
3336
3336
3337
- if reset_request. reset_password_key . is_none ( )
3338
- && OrgPolicy :: org_is_reset_password_auto_enroll ( & org_id, & mut conn) . await
3339
- {
3337
+ let reset_password_key = match reset_request. reset_password_key {
3338
+ None => None ,
3339
+ Some ( ref key) if key. is_empty ( ) => None ,
3340
+ Some ( key) => Some ( key) ,
3341
+ } ;
3342
+
3343
+ if reset_password_key. is_none ( ) && OrgPolicy :: org_is_reset_password_auto_enroll ( & org_id, & mut conn) . await {
3340
3344
err ! ( "Reset password can't be withdrawn due to an enterprise policy" ) ;
3341
3345
}
3342
3346
3343
- if reset_request . reset_password_key . is_some ( ) {
3347
+ if reset_password_key. is_some ( ) {
3344
3348
PasswordOrOtpData {
3345
3349
master_password_hash : reset_request. master_password_hash ,
3346
3350
otp : reset_request. otp ,
@@ -3349,7 +3353,7 @@ async fn put_reset_password_enrollment(
3349
3353
. await ?;
3350
3354
}
3351
3355
3352
- member. reset_password_key = reset_request . reset_password_key ;
3356
+ member. reset_password_key = reset_password_key;
3353
3357
member. save ( & mut conn) . await ?;
3354
3358
3355
3359
let log_id = if member. reset_password_key . is_some ( ) {
You can’t perform that action at this time.
0 commit comments