From aee1070ed6a42068bd0e25f561be0e44f791af0a Mon Sep 17 00:00:00 2001
From: BlackDex <black.dex@gmail.com>
Date: Fri, 28 Jun 2024 17:37:03 +0200
Subject: [PATCH] Fix collections and native app issue

Collections were not visible in the organization view.
This was because the `flexibleCollections` was set to `true`

Found an issue with loading some old created Secure Notes which had `{}`
as there `data` value. This isn't allowed. When detected, replace it
with `{"type":0}`

Fixes #4682
---
 src/db/models/cipher.rs       | 6 ++++++
 src/db/models/organization.rs | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index f765f470..c2e1de5f 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 && type_data_json == Value::Object(serde_json::Map::new()) {
+            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,