From 190ba792a1392a900008af4bbc73fbd3bb1bcb45 Mon Sep 17 00:00:00 2001
From: Dave Severns <149429124+dseverns-livefront@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:22:21 -0400
Subject: [PATCH] [PM-10905] Update JSON model to match API (#3913)

---
 .../model/OrganizationDomainSsoDetailsResponseJson.kt    | 9 ---------
 .../network/service/OrganizationServiceTest.kt           | 4 ----
 .../bitwarden/data/auth/repository/AuthRepositoryTest.kt | 4 ----
 3 files changed, 17 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/OrganizationDomainSsoDetailsResponseJson.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/OrganizationDomainSsoDetailsResponseJson.kt
index 94edbb6a7a..ad03c30f42 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/OrganizationDomainSsoDetailsResponseJson.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/OrganizationDomainSsoDetailsResponseJson.kt
@@ -1,25 +1,16 @@
 package com.x8bit.bitwarden.data.auth.datasource.network.model
 
-import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import java.time.ZonedDateTime
 
 /**
  * Response object returned when requesting organization domain SSO details.
  *
  * @property isSsoAvailable Whether or not SSO is available for this domain.
- * @property domainName The organization's domain name.
  * @property organizationIdentifier The organization's identifier.
- * @property isSsoRequired Whether or not SSO is required.
- * @property verifiedDate The date these details were verified.
  */
 @Serializable
 data class OrganizationDomainSsoDetailsResponseJson(
     @SerialName("ssoAvailable") val isSsoAvailable: Boolean,
-    @SerialName("domainName") val domainName: String,
     @SerialName("organizationIdentifier") val organizationIdentifier: String,
-    @SerialName("ssoRequired") val isSsoRequired: Boolean,
-    @Contextual
-    @SerialName("verifiedDate") val verifiedDate: ZonedDateTime?,
 )
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt
index 287ffbcadb..8c3e0f5490 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceTest.kt
@@ -13,7 +13,6 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import retrofit2.create
-import java.time.ZonedDateTime
 
 class OrganizationServiceTest : BaseServiceTest() {
     private val authenticatedOrganizationApi: AuthenticatedOrganizationApi = retrofit.create()
@@ -131,9 +130,6 @@ private const val ORGANIZATION_DOMAIN_SSO_DETAILS_JSON = """
 private val ORGANIZATION_DOMAIN_SSO_BODY = OrganizationDomainSsoDetailsResponseJson(
     isSsoAvailable = true,
     organizationIdentifier = "Test Org",
-    domainName = "bitwarden.com",
-    isSsoRequired = false,
-    verifiedDate = ZonedDateTime.parse("2024-09-13T00:00Z"),
 )
 
 private const val ORGANIZATION_KEYS_JSON = """
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt
index c79a7285eb..640044c5d2 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt
@@ -142,7 +142,6 @@ import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import java.time.ZonedDateTime
 
 @Suppress("LargeClass")
 class AuthRepositoryTest {
@@ -5149,9 +5148,6 @@ class AuthRepositoryTest {
         } returns OrganizationDomainSsoDetailsResponseJson(
             isSsoAvailable = true,
             organizationIdentifier = "Test Org",
-            domainName = "bitwarden.com",
-            isSsoRequired = false,
-            verifiedDate = ZonedDateTime.parse("2024-09-13T00:00Z"),
         )
             .asSuccess()
         val result = repository.getOrganizationDomainSsoDetails(email)