Merge pull request #3740 from BlackDex/fix-ldap-import-org-status

Fix UserOrg status during LDAP Import
This commit is contained in:
Daniel García 2023-08-12 22:19:20 +02:00 committed by GitHub
commit dacd50f3f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -85,7 +85,7 @@ async fn ldap_import(data: JsonUpcase<OrgImportData>, token: PublicToken, mut co
new_user
}
};
let user_org_status = if CONFIG.mail_enabled() {
let user_org_status = if CONFIG.mail_enabled() || user.password_hash.is_empty() {
UserOrgStatus::Invited as i32
} else {
UserOrgStatus::Accepted as i32 // Automatically mark user as accepted if no email invites