From 911bb40be897d54985233c9706120b993be596ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bispo?= Date: Tue, 5 Aug 2025 23:15:40 +0100 Subject: [PATCH] [PM-24473] Remove exemption from restrict item types policy (#5646) --- .../platform/manager/PolicyManagerImpl.kt | 1 + .../platform/manager/PolicyManagerTest.kt | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt index 257ad0ea48..f0513799ca 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt @@ -99,6 +99,7 @@ class PolicyManagerImpl( PolicyTypeJson.PASSWORD_GENERATOR, PolicyTypeJson.REMOVE_UNLOCK_WITH_PIN, + PolicyTypeJson.RESTRICT_ITEM_TYPES, -> { false } diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt index 73128b9156..07b9e0f2de 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerTest.kt @@ -193,6 +193,34 @@ class PolicyManagerTest { assertTrue(policyManager.getActivePolicies(type = PolicyTypeJson.PASSWORD_GENERATOR).any()) } + + @Test + fun `getActivePolicies returns active and applied restrict item types policies`() { + val userState: UserStateJson = mockk { + every { activeUserId } returns USER_ID + } + every { authDiskSource.userState } returns userState + every { + authDiskSource.getOrganizations(USER_ID) + } returns listOf( + createMockOrganization( + number = 3, + isEnabled = true, + shouldUsePolicies = true, + ), + ) + every { + authDiskSource.getPolicies(USER_ID) + } returns listOf( + createMockPolicy( + organizationId = "mockId-3", + isEnabled = true, + type = PolicyTypeJson.RESTRICT_ITEM_TYPES, + ), + ) + + assertTrue(policyManager.getActivePolicies(type = PolicyTypeJson.RESTRICT_ITEM_TYPES).any()) + } } private const val USER_ID = "userId"