Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-08-19 02:15:24 +02:00
Merge pull request #3659 from BlackDex/fix-org-creation
Fix org creation regresion
Dieser Commit ist enthalten in:
Commit
1c7338c7c4
1 geänderte Dateien mit 1 neuen und 2 gelöschten Zeilen
|
@ -106,7 +106,6 @@ struct OrgData {
|
||||||
CollectionName: String,
|
CollectionName: String,
|
||||||
Key: String,
|
Key: String,
|
||||||
Name: String,
|
Name: String,
|
||||||
ExternalId: String,
|
|
||||||
Keys: Option<OrgKeyData>,
|
Keys: Option<OrgKeyData>,
|
||||||
#[serde(rename = "PlanType")]
|
#[serde(rename = "PlanType")]
|
||||||
_PlanType: NumberOrString, // Ignored, always use the same plan
|
_PlanType: NumberOrString, // Ignored, always use the same plan
|
||||||
|
@ -170,7 +169,7 @@ async fn create_organization(headers: Headers, data: JsonUpcase<OrgData>, mut co
|
||||||
|
|
||||||
let org = Organization::new(data.Name, data.BillingEmail, private_key, public_key);
|
let org = Organization::new(data.Name, data.BillingEmail, private_key, public_key);
|
||||||
let mut user_org = UserOrganization::new(headers.user.uuid, org.uuid.clone());
|
let mut user_org = UserOrganization::new(headers.user.uuid, org.uuid.clone());
|
||||||
let collection = Collection::new(org.uuid.clone(), data.CollectionName, Some(data.ExternalId));
|
let collection = Collection::new(org.uuid.clone(), data.CollectionName, None);
|
||||||
|
|
||||||
user_org.akey = data.Key;
|
user_org.akey = data.Key;
|
||||||
user_org.access_all = true;
|
user_org.access_all = true;
|
||||||
|
|
Laden …
In neuem Issue referenzieren