Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix issue with adding ciphers to organizations on native ios app #4800

Merged
merged 2 commits into from
Jul 30, 2024
Merged

fix issue with adding ciphers to organizations on native ios app #4800

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8174204
add organizationID alias for native ios
stefan0xC Jul 30, 2024
69385fc
add reverse sanity check
stefan0xC Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/api/core/ciphers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ pub struct CipherData {
// Folder id is not included in import
folder_id: Option<String>,
// TODO: Some of these might appear all the time, no need for Option
#[serde(alias = "organizationID")]
pub organization_id: Option<String>,

key: Option<String>,
Expand Down Expand Up @@ -286,6 +287,10 @@ async fn post_ciphers_create(
if data.cipher.organization_id.is_some() && data.collection_ids.is_empty() {
err!("You must select at least one collection.");
}
// reverse sanity check to prevent corruptions
if !data.collection_ids.is_empty() && data.cipher.organization_id.is_none() {
err!("The client has not provided an organization id!");
}

// This check is usually only needed in update_cipher_from_data(), but we
// need it here as well to avoid creating an empty cipher in the call to
Expand Down
Loading