saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-10-29 09:20:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Org identifier (#6364)

Browse Source 
* Fix Org identifier

* Org invitation default to SSO when SSO_ENABLED
This commit is contained in:
Timshel
2025-10-21 19:20:18 +02:00
committed by GitHub
parent e659a61581
commit 8043f7eca7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/core/organizations.rs
View File

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

4
src/mail.rs
View File

@@ -302,9 +302,9 @@ pub async fn send_invite(
.append_pair("organizationUserId", &member_id) .append_pair("organizationUserId", &member_id)
.append_pair("token", &invite_token); .append_pair("token", &invite_token);
if CONFIG.sso_enabled() && CONFIG.sso_only() { if CONFIG.sso_enabled() {
query_params.append_pair("orgUserHasExistingUser", "false"); 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() { } else if user.private_key.is_some() {
query_params.append_pair("orgUserHasExistingUser", "true"); query_params.append_pair("orgUserHasExistingUser", "true");
} }