github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-21 13:52:07 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

PM-18677: Policies for disabled organizations apply (#4801)

Browse Source
This commit is contained in:
David Perez
2025-02-27 15:54:47 -06:00
committed by GitHub
parent 3ceda9e40a
commit ef6d9bc68c
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt
View File

@@ -70,7 +70,6 @@ class PolicyManagerImpl(
.getOrganizations(userId)
?.filter {
it.shouldUsePolicies &&
it.isEnabled &&
it.status >= OrganizationStatusType.ACCEPTED &&
!isOrganizationExemptFromPolicies(it, type)
}

1
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendEmpty.kt
View File

@@ -41,6 +41,7 @@ fun SendEmpty(
modifier = modifier.verticalScroll(rememberScrollState()),
) {
if (policyDisablesSend) {
Spacer(modifier = Modifier.height(12.dp))
BitwardenInfoCalloutCard(
text = stringResource(id = R.string.send_disabled_warning),
modifier = Modifier

26
app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt
View File

@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.data.platform.manager
import app.cash.turbine.test
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.OrganizationType
import com.x8bit.bitwarden.data.vault.datasource.network.model.PolicyTypeJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.SyncResponseJson
import com.x8bit.bitwarden.data.vault.datasource.network.model.createMockOrganization
@@ -140,6 +141,31 @@ class PolicyManagerTest {
assertTrue(policyManager.getActivePolicies(type = PolicyTypeJson.MASTER_PASSWORD).isEmpty())
}
@Test
fun `getActivePolicies returns active and applied policies for disabled organizations`() {
val userState: UserStateJson = mockk {
every { activeUserId } returns USER_ID
}
val policy = createMockPolicy(organizationId = "mockId-3", isEnabled = true)
every { authDiskSource.userState } returns userState
every {
authDiskSource.getOrganizations(USER_ID)
} returns listOf(
createMockOrganization(
number = 3,
isEnabled = false,
shouldUsePolicies = true,
type = OrganizationType.USER,
),
)
every { authDiskSource.getPolicies(USER_ID) } returns listOf(policy)
assertEquals(
listOf(policy),
policyManager.getActivePolicies(type = PolicyTypeJson.MASTER_PASSWORD),
)
}
@Test
fun `getActivePolicies returns active and applied PasswordGenerator policies`() {
val userState: UserStateJson = mockk {

3
app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/network/model/SyncResponseProfileUtil.kt
View File

@@ -36,12 +36,13 @@ fun createMockOrganization(
isEnabled: Boolean = false,
shouldUsePolicies: Boolean = false,
shouldManageResetPassword: Boolean = false,
type: OrganizationType = OrganizationType.ADMIN,
): SyncResponseJson.Profile.Organization =
SyncResponseJson.Profile.Organization(
shouldUsePolicies = shouldUsePolicies,
shouldUseKeyConnector = false,
keyConnectorUrl = "mockKeyConnectorUrl-$number",
type = OrganizationType.ADMIN,
type = type,
seats = 1,
isEnabled = isEnabled,
providerType = 1,