Browse Source

Merge ba4b290468 into 3f010a50af

pull/6364/merge
Timshel 2 days ago
committed by GitHub
parent
commit
8101166f64
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      src/api/core/organizations.rs
  2. 2
      src/mail.rs

8
src/api/core/organizations.rs

@ -354,9 +354,11 @@ async fn get_auto_enroll_status(identifier: &str, headers: Headers, mut conn: Db
let (id, identifier, rp_auto_enroll) = match org {
None => (get_uuid(), identifier.to_string(), false),
Some(org) => {
(org.uuid.to_string(), org.name, OrgPolicy::org_is_reset_password_auto_enroll(&org.uuid, &mut conn).await)
}
Some(org) => (
org.uuid.to_string(),
org.uuid.to_string(),
OrgPolicy::org_is_reset_password_auto_enroll(&org.uuid, &mut conn).await,
),
};
Ok(Json(json!({

2
src/mail.rs

@ -304,7 +304,7 @@ pub async fn send_invite(
if CONFIG.sso_enabled() && CONFIG.sso_only() {
query_params.append_pair("orgUserHasExistingUser", "false");
query_params.append_pair("orgSsoIdentifier", org_name);
query_params.append_pair("orgSsoIdentifier", &org_id);
} else if user.private_key.is_some() {
query_params.append_pair("orgUserHasExistingUser", "true");
}

Loading…
Cancel
Save