Browse Source

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
pull/4703/head
Mathijs van Veluw 7 months ago
committed by GitHub
parent
commit
d42b264a93
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      src/db/models/cipher.rs
  2. 2
      src/db/models/organization.rs

6
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();

2
src/db/models/organization.rs

@ -406,7 +406,7 @@ impl UserOrganization {
"accessSecretsManager": false,
"limitCollectionCreationDeletion": true,
"allowAdminAccessToAllCollectionItems": true,
"flexibleCollections": true,
"flexibleCollections": false,
"permissions": permissions,

Loading…
Cancel
Save