aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathijs van Veluw <[email protected]>2023-07-06 10:39:59 +0200
committerGitHub <[email protected]>2023-07-06 10:39:59 +0200
commit1c7338c7c4c7cb5b59f9cc710f0667e21346cfbf (patch)
treecceb568605384a6313fdb9012b3357203441218e
parent4826ddca4c69356ce9e88c59cb5c424d7c9d5ca3 (diff)
parent08f37b99355c2ea04c7d6a9eaf1138450fcc97a2 (diff)
downloadvaultwarden-1c7338c7c4c7cb5b59f9cc710f0667e21346cfbf.tar.gz
vaultwarden-1c7338c7c4c7cb5b59f9cc710f0667e21346cfbf.zip
Merge pull request #3659 from BlackDex/fix-org-creation1.29.0
Fix org creation regresion
-rw-r--r--src/api/core/organizations.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index cd5455d2..a1814c60 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -106,7 +106,6 @@ struct OrgData {
CollectionName: String,
Key: String,
Name: String,
- ExternalId: String,
Keys: Option<OrgKeyData>,
#[serde(rename = "PlanType")]
_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 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.access_all = true;