PM-38130: Feat: Parse new organizations and policies properties from sync response (#6977)

Author: david-livefront

app/src/test/kotlin/com/x8bit/bitwarden/data/vault/datasource/disk/VaultDiskSourceTest.kt

@@ -10,6 +10,7 @@ import com.bitwarden.network.model.createMockCollection
 import com.bitwarden.network.model.createMockDomains
 import com.bitwarden.network.model.createMockFolder
 import com.bitwarden.network.model.createMockSend
+import com.bitwarden.network.model.createMockSyncResponse
 import com.x8bit.bitwarden.data.vault.datasource.disk.dao.FakeCiphersDao
 import com.x8bit.bitwarden.data.vault.datasource.disk.dao.FakeCollectionsDao
 import com.x8bit.bitwarden.data.vault.datasource.disk.dao.FakeDomainsDao
@@ -459,7 +460,8 @@ private val DOMAINS_1: SyncResponseJson.Domains = createMockDomains(1)
 private val FOLDER_1: SyncResponseJson.Folder = createMockFolder(2)
 private val SEND_1: SyncResponseJson.Send = createMockSend(1)
 
-private val VAULT_DATA: SyncResponseJson = SyncResponseJson(
+private val VAULT_DATA: SyncResponseJson = createMockSyncResponse(
+    number = 1,
     folders = listOf(FOLDER_1),
     collections = listOf(COLLECTION_1),
     profile = mockk<SyncResponseJson.Profile> {

network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt

@@ -42,7 +42,11 @@ data class SyncResponseJson(
 
     @Contextual
     @SerialName("policies")
-    val policies: List<Policy>?,
+    private val legacyPolicies: List<Policy>?,
+
+    @Contextual
+    @SerialName("policiesNew")
+    private val newPolicies: List<Policy>?,
 
     @SerialName("domains")
     @JsonNames("Domains")
@@ -54,6 +58,11 @@ data class SyncResponseJson(
     @SerialName("userDecryption")
     val userDecryption: UserDecryptionJson?,
 ) {
+    /**
+     * A list of policies associated with the vault data (nullable).
+     */
+    val policies: List<Policy>? get() = newPolicies ?: legacyPolicies
+
     /**
      * Represents domains in the vault response.
      *
@@ -207,7 +216,10 @@ data class SyncResponseJson(
         val name: String?,
 
         @SerialName("organizations")
-        val organizations: List<Organization>?,
+        private val legacyOrganizations: List<Organization>?,
+
+        @SerialName("organizationsNew")
+        private val newOrganizations: List<Organization>?,
 
         @SerialName("usesKeyConnector")
         val shouldUseKeyConnector: Boolean,
@@ -234,6 +246,11 @@ data class SyncResponseJson(
         @Contextual
         val creationDate: Instant,
     ) {
+        /**
+         * A list of organizations associated with the profile (nullable).
+         */
+        val organizations: List<Organization>? get() = newOrganizations ?: legacyOrganizations
+
         /**
          * Represents an organization in the vault response.
          *

network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt

@@ -122,6 +122,55 @@ private const val SYNC_SUCCESS_JSON = """
         "userIsClaimedByOrganization": false
       }
     ],
+    "organizationsNew": [
+      {
+        "usePolicies": false,
+        "keyConnectorEnabled": false,
+        "keyConnectorUrl": "mockKeyConnectorUrl-1",
+        "type": 1,
+        "seats": 1,
+        "enabled": false,
+        "providerType": 1,
+        "maxCollections": 1,
+        "selfHost": false,
+        "permissions": {
+          "manageGroups": false,
+          "manageResetPassword": false,
+          "accessReports": false,
+          "managePolicies": false,
+          "deleteAnyCollection": false,
+          "manageSso": false,
+          "deleteAssignedCollections": false,
+          "manageUsers": false,
+          "accessImportExport": false,
+          "editAnyCollection": false,
+          "accessEventLogs": false,
+          "createNewCollections": false,
+          "editAssignedCollections": false
+        },
+        "providerId": "mockProviderId-1",
+        "id": "mockId-1",
+        "useGroups": false,
+        "useDirectory": false,
+        "key": "mockKey-1",
+        "providerName": "mockProviderName-1",
+        "usersGetPremium": false,
+        "maxStorageGb": 1,
+        "identifier": "mockIdentifier-1",
+        "use2fa": false,
+        "familySponsorshipToDelete": false,
+        "userId": "mockUserId-1",
+        "useEvents": false,
+        "familySponsorshipFriendlyName": "mockFamilySponsorshipFriendlyName-1",
+        "useTotp": false,
+        "familySponsorshipLastSyncDate": "2023-10-27T12:00:00.00Z",
+        "name": "mockName-1",
+        "useApi": false,
+        "familySponsorshipValidUntil": "2023-10-27T12:00:00.00Z",
+        "status": 1,
+        "userIsClaimedByOrganization": false
+      }
+    ],
     "providers": [
       {
         "useEvents": false,
@@ -403,6 +452,14 @@ private const val SYNC_SUCCESS_JSON = """
       "enabled": false
     }
   ],
+  "policiesNew": [
+    {
+      "organizationId": "mockOrganizationId-1",
+      "id": "mockId-1",
+      "type": 1,
+      "enabled": false
+    }
+  ],
   "sends": [
     {
       "accessCount": 1,

network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt

@@ -48,7 +48,8 @@ fun createMockProfile(
         isPremium = isPremium,
         culture = culture,
         name = name,
-        organizations = organizations,
+        legacyOrganizations = organizations,
+        newOrganizations = organizations,
         shouldUseKeyConnector = shouldUseKeyConnector,
         id = id,
         masterPasswordHint = masterPasswordHint,

network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseUtil.kt

@@ -10,7 +10,7 @@ fun createMockSyncResponse(
     collections: List<SyncResponseJson.Collection> = listOf(createMockCollection(number = number)),
     profile: SyncResponseJson.Profile = createMockProfile(number = number),
     ciphers: List<SyncResponseJson.Cipher> = listOf(createMockCipher(number = number)),
-    policies: List<SyncResponseJson.Policy> = listOf(createMockPolicy(number = number)),
+    policies: List<SyncResponseJson.Policy>? = listOf(createMockPolicy(number = number)),
     domains: SyncResponseJson.Domains = createMockDomains(number = number),
     sends: List<SyncResponseJson.Send> = listOf(createMockSend(number = number)),
     userDecryption: UserDecryptionJson? = createMockUserDecryption(number = number),
@@ -20,7 +20,8 @@ fun createMockSyncResponse(
         collections = collections,
         profile = profile,
         ciphers = ciphers,
-        policies = policies,
+        legacyPolicies = policies,
+        newPolicies = policies,
         domains = domains,
         sends = sends,
         userDecryption = userDecryption,