From eb9e3b9daff7487100dc0c7f42ab206ff0667a90 Mon Sep 17 00:00:00 2001
From: Mathijs van Veluw <black.dex@gmail.com>
Date: Wed, 3 Jul 2024 21:11:04 +0200
Subject: [PATCH] Fix collections and native app issue (#4685)

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 `{}` or `{"type":null}` as there `data` value.
This isn't allowed. When detected, replace it with `{"type":0}`

Fixes #4682
Fixes #4590
---
 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 f765f4706a3..545463d39f4 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 fce9f9c91f6..f378ba401c7 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,