From f1f16cfee5a69cc8e6fd3e8e7524a153b87de2c5 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Thu, 22 Aug 2024 15:17:54 -0500
Subject: [PATCH] PM-11265: Remove the leave organization API (#3811)

---
 .../network/api/AuthenticatedOrganizationApi.kt          | 9 ---------
 .../datasource/network/service/OrganizationService.kt    | 7 -------
 .../network/service/OrganizationServiceImpl.kt           | 5 -----
 .../network/service/OrganizationServiceTest.kt           | 7 -------
 4 files changed, 28 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedOrganizationApi.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedOrganizationApi.kt
index 69cb453b8..0fd01787c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedOrganizationApi.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedOrganizationApi.kt
@@ -5,7 +5,6 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationKeysRe
 import com.x8bit.bitwarden.data.auth.datasource.network.model.OrganizationResetPasswordEnrollRequestJson
 import retrofit2.http.Body
 import retrofit2.http.GET
-import retrofit2.http.POST
 import retrofit2.http.PUT
 import retrofit2.http.Path
 
@@ -38,12 +37,4 @@ interface AuthenticatedOrganizationApi {
     suspend fun getOrganizationKeys(
         @Path("id") organizationId: String,
     ): Result<OrganizationKeysResponseJson>
-
-    /**
-     * Leaves the this organization.
-     */
-    @POST("/organizations/{id}/leave")
-    suspend fun leaveOrganization(
-        @Path("id") organizationId: String,
-    ): Result<Unit>
 }
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationService.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationService.kt
index 553e32883..d25d6765d 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationService.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationService.kt
@@ -38,11 +38,4 @@ interface OrganizationService {
     suspend fun getOrganizationKeys(
         organizationId: String,
     ): Result<OrganizationKeysResponseJson>
-
-    /**
-     * Leaves this organization.
-     */
-    suspend fun leaveOrganization(
-        organizationId: String,
-    ): Result<Unit>
 }
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceImpl.kt
index bb09ab810..8de08bd27 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/OrganizationServiceImpl.kt
@@ -52,9 +52,4 @@ class OrganizationServiceImpl(
         .getOrganizationKeys(
             organizationId = organizationId,
         )
-
-    override suspend fun leaveOrganization(
-        organizationId: String,
-    ): Result<Unit> =
-        authenticatedOrganizationApi.leaveOrganization(organizationId = organizationId)
 }
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 51fb31e49..287ffbcad 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
@@ -104,13 +104,6 @@ class OrganizationServiceTest : BaseServiceTest() {
         val result = organizationService.getOrganizationKeys("orgId")
         assertTrue(result.isFailure)
     }
-
-    @Test
-    fun `leaveOrganization when response is success should return success`() = runTest {
-        server.enqueue(MockResponse())
-        val result = organizationService.leaveOrganization(organizationId = "orgId")
-        assertTrue(result.isSuccess)
-    }
 }
 
 private const val ORGANIZATION_AUTO_ENROLL_STATUS_JSON = """