aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/db/models/cipher.rs6
-rw-r--r--src/db/models/organization.rs2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index f765f470..545463d3 100644
--- a/src/db/models/cipher.rs
+++ b/src/db/models/cipher.rs
@@ -189,6 +189,12 @@ impl Cipher {
}
}
+ // Fix secure note issues when data is `{}`
+ // This breaks at least the native mobile clients
+ if self.atype == 2 && (self.data.eq("{}") || self.data.to_ascii_lowercase().eq("{\"type\":null}")) {
+ type_data_json = json!({"type": 0});
+ }
+
// Clone the type_data and add some default value.
let mut data_json = type_data_json.clone();
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
index fce9f9c9..f378ba40 100644
--- a/src/db/models/organization.rs
+++ b/src/db/models/organization.rs
@@ -406,7 +406,7 @@ impl UserOrganization {
"accessSecretsManager": false,
"limitCollectionCreationDeletion": true,
"allowAdminAccessToAllCollectionItems": true,
- "flexibleCollections": true,
+ "flexibleCollections": false,
"permissions": permissions,