Back port Reverts PM-14995 (#4633) (#4635)

bitwarden · Jan 28, 2025 · b2c4fbb · b2c4fbb
1 parent e2dec1f
commit b2c4fbb
Show file tree

Hide file tree

Showing 39 changed files with 56 additions and 320 deletions.
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt
@@ -18,5 +18,4 @@ data class Organization(
     val shouldManageResetPassword: Boolean,
     val shouldUseKeyConnector: Boolean,
     val role: OrganizationType,
-    val shouldUsersGetPremium: Boolean,
 )
diff --git a/...src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt b/...src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt
@@ -22,7 +22,6 @@ fun SyncResponseJson.Profile.Organization.toOrganization(): Organization =
         shouldUseKeyConnector = this.shouldUseKeyConnector,
         role = this.type,
         shouldManageResetPassword = this.permissions.shouldManageResetPassword,
-        shouldUsersGetPremium = this.shouldUsersGetPremium,
     )
 
 /**

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerImpl.kt
@@ -9,7 +9,6 @@ import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardMan
 import com.x8bit.bitwarden.data.platform.repository.SettingsRepository
 import com.x8bit.bitwarden.data.vault.repository.VaultRepository
 import com.x8bit.bitwarden.data.vault.repository.model.GenerateTotpResult
-import com.x8bit.bitwarden.ui.vault.feature.vault.util.getOrganizationPremiumStatusMap
 import java.time.Clock
 
 /**
@@ -25,15 +24,8 @@ class AutofillTotpManagerImpl(
 ) : AutofillTotpManager {
     override suspend fun tryCopyTotpToClipboard(cipherView: CipherView) {
         if (settingsRepository.isAutoCopyTotpDisabled) return
-        val organizationPremiumStatusMap = authRepository
-            .userStateFlow
-            .value
-            ?.activeAccount
-            ?.getOrganizationPremiumStatusMap()
-            .orEmpty()
         val isPremium = authRepository.userStateFlow.value?.activeAccount?.isPremium == true
-        val premiumStatus = organizationPremiumStatusMap[cipherView.organizationId] ?: isPremium
-        if (!premiumStatus && !cipherView.organizationUseTotp) return
+        if (!isPremium && !cipherView.organizationUseTotp) return
         val totpCode = cipherView.login?.totp ?: return
 
         val totpResult = vaultRepository.generateTotp(

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt
@@ -122,7 +122,6 @@ class TotpCodeManagerImpl(
                                         CipherRepromptType.NONE -> false
                                     },
                                     orgUsesTotp = cipher.organizationUseTotp,
-                                    orgId = cipher.organizationId,
                                 )
                             }
                             .onFailure {

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt
@@ -29,5 +29,4 @@ data class VerificationCodeItem(
     val username: String?,
     val hasPasswordReprompt: Boolean,
     val orgUsesTotp: Boolean,
-    val orgId: String?,
 )
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt
@@ -46,7 +46,6 @@ import com.x8bit.bitwarden.ui.platform.feature.search.util.updateWithAdditionalD
 import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction
 import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterData
 import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
-import com.x8bit.bitwarden.ui.vault.feature.vault.util.getOrganizationPremiumStatusMap
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toFilteredList
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toVaultFilterData
 import com.x8bit.bitwarden.ui.vault.model.TotpData
@@ -108,9 +107,6 @@ class SearchViewModel @Inject constructor(
                 totpData = specialCircumstance?.toTotpDataOrNull(),
                 hasMasterPassword = userState.activeAccount.hasMasterPassword,
                 isPremium = userState.activeAccount.isPremium,
-                organizationPremiumStatusMap = userState
-                    .activeAccount
-                    .getOrganizationPremiumStatusMap(),
             )
         },
 ) {
@@ -691,7 +687,6 @@ class SearchViewModel @Inject constructor(
                                 isAutofill = state.isAutofill,
                                 isTotp = state.isTotp,
                                 isPremiumUser = state.isPremium,
-                                organizationPremiumStatusMap = state.organizationPremiumStatusMap,
                             )
                     }
 
@@ -738,7 +733,6 @@ data class SearchState(
     val totpData: TotpData?,
     val hasMasterPassword: Boolean,
     val isPremium: Boolean,
-    val organizationPremiumStatusMap: Map<String, Boolean>,
 ) : Parcelable {
 
     /**

diff --git a/...main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt b/...main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt
@@ -153,7 +153,6 @@ fun List<CipherView>.toViewState(
     isAutofill: Boolean,
     isTotp: Boolean,
     isPremiumUser: Boolean,
-    organizationPremiumStatusMap: Map<String, Boolean>,
 ): SearchState.ViewState =
     when {
         searchTerm.isEmpty() -> SearchState.ViewState.Empty(message = null)
@@ -166,7 +165,6 @@ fun List<CipherView>.toViewState(
                     isAutofill = isAutofill,
                     isTotp = isTotp,
                     isPremiumUser = isPremiumUser,
-                    organizationPremiumStatusMap = organizationPremiumStatusMap,
                 )
                     .sortAlphabetically(),
             )
@@ -187,17 +185,15 @@ private fun List<CipherView>.toDisplayItemList(
     isAutofill: Boolean,
     isTotp: Boolean,
     isPremiumUser: Boolean,
-    organizationPremiumStatusMap: Map<String, Boolean>,
 ): List<SearchState.DisplayItem> =
     this.map {
-        val premiumStatus = organizationPremiumStatusMap[it.organizationId] ?: isPremiumUser
         it.toDisplayItem(
             baseIconUrl = baseIconUrl,
             hasMasterPassword = hasMasterPassword,
             isIconLoadingDisabled = isIconLoadingDisabled,
             isAutofill = isAutofill,
             isTotp = isTotp,
-            isPremiumUser = premiumStatus,
+            isPremiumUser = isPremiumUser,
         )
     }
 

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
@@ -8,7 +8,6 @@ import com.bitwarden.vault.CipherView
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.auth.repository.AuthRepository
 import com.x8bit.bitwarden.data.auth.repository.model.BreachCountResult
-import com.x8bit.bitwarden.data.auth.repository.model.Organization
 import com.x8bit.bitwarden.data.auth.repository.model.UserState
 import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult
 import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
@@ -1059,20 +1058,16 @@ class VaultItemViewModel @Inject constructor(
     ): VaultItemState.ViewState = this
         .data
         ?.cipher
-        ?.let { cipher ->
-            val ownerOrg: Organization? = account.organizations.find {
-                cipher.organizationId == it.id
-            }
-            cipher.toViewState(
-                previousState = state.viewState.asContentOrNull(),
-                isPremiumUser = ownerOrg?.shouldUsersGetPremium ?: account.isPremium,
-                hasMasterPassword = account.hasMasterPassword,
-                totpCodeItemData = this.data?.totpCodeItemData,
-                canDelete = this.data?.canDelete == true,
-                canAssignToCollections = this.data?.canAssociateToCollections == true,
-                canEdit = this.data?.canEdit == true,
-            )
-        }
+        ?.toViewState(
+            previousState = state.viewState.asContentOrNull(),
+            isPremiumUser = account.isPremium,
+            hasMasterPassword = account.hasMasterPassword,
+            totpCodeItemData = this.data?.totpCodeItemData,
+            canDelete = this.data?.canDelete == true,
+            canAssignToCollections = this.data?.canAssociateToCollections == true,
+            canEdit = this.data?.canEdit == true,
+        )
+
         ?: VaultItemState.ViewState.Error(message = errorText)
 
     private fun handleValidatePasswordReceive(

diff --git a/...c/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/...c/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
@@ -71,7 +71,6 @@ import com.x8bit.bitwarden.ui.vault.feature.itemlisting.util.toVaultItemCipherTy
 import com.x8bit.bitwarden.ui.vault.feature.itemlisting.util.toViewState
 import com.x8bit.bitwarden.ui.vault.feature.itemlisting.util.updateWithAdditionalDataIfNecessary
 import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
-import com.x8bit.bitwarden.ui.vault.feature.vault.util.getOrganizationPremiumStatusMap
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toActiveAccountSummary
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toFilteredList
@@ -106,8 +105,8 @@ class VaultItemListingViewModel @Inject constructor(
     private val cipherMatchingManager: CipherMatchingManager,
     private val specialCircumstanceManager: SpecialCircumstanceManager,
     private val policyManager: PolicyManager,
-    private val fido2CredentialManager: Fido2CredentialManager,
     private val fido2OriginManager: Fido2OriginManager,
+    private val fido2CredentialManager: Fido2CredentialManager,
     private val organizationEventManager: OrganizationEventManager,
 ) : BaseViewModel<VaultItemListingState, VaultItemListingEvent, VaultItemListingsAction>(
     initialState = run {
@@ -141,9 +140,6 @@ class VaultItemListingViewModel @Inject constructor(
             fido2GetCredentialsRequest = specialCircumstance?.toFido2GetCredentialsRequestOrNull(),
             isPremium = userState.activeAccount.isPremium,
             isRefreshing = false,
-            organizationPremiumStatusMap = userState
-                .activeAccount
-                .getOrganizationPremiumStatusMap(),
         )
     },
 ) {
@@ -1586,7 +1582,6 @@ class VaultItemListingViewModel @Inject constructor(
                                 .fido2CredentialAutofillViewList,
                             totpData = state.totpData,
                             isPremiumUser = state.isPremium,
-                            organizationPremiumStatusMap = state.organizationPremiumStatusMap,
                         )
                     }
 
@@ -1752,7 +1747,6 @@ data class VaultItemListingState(
     val hasMasterPassword: Boolean,
     val isPremium: Boolean,
     val isRefreshing: Boolean,
-    val organizationPremiumStatusMap: Map<String, Boolean>,
 ) {
     /**
      * Whether or not the add FAB should be shown.

diff --git a/...a/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt b/...a/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt
@@ -111,7 +111,6 @@ fun VaultData.toViewState(
     fido2CredentialAutofillViews: List<Fido2CredentialAutofillView>?,
     totpData: TotpData?,
     isPremiumUser: Boolean,
-    organizationPremiumStatusMap: Map<String, Boolean>,
 ): VaultItemListingState.ViewState {
     val filteredCipherViewList = cipherViewList
         .filter { cipherView ->
@@ -143,7 +142,6 @@ fun VaultData.toViewState(
                 fido2CredentialAutofillViews = fido2CredentialAutofillViews,
                 isPremiumUser = isPremiumUser,
                 isTotp = totpData != null,
-                organizationPremiumStatusMap = organizationPremiumStatusMap,
             ),
             displayFolderList = folderList.map { folderView ->
                 VaultItemListingState.FolderDisplayItem(
@@ -292,10 +290,8 @@ private fun List<CipherView>.toDisplayItemList(
     fido2CredentialAutofillViews: List<Fido2CredentialAutofillView>?,
     isPremiumUser: Boolean,
     isTotp: Boolean,
-    organizationPremiumStatusMap: Map<String, Boolean>,
 ): List<VaultItemListingState.DisplayItem> =
     this.map {
-        val premiumStatus = organizationPremiumStatusMap[it.organizationId] ?: isPremiumUser
         it.toDisplayItem(
             baseIconUrl = baseIconUrl,
             hasMasterPassword = hasMasterPassword,
@@ -306,7 +302,7 @@ private fun List<CipherView>.toDisplayItemList(
                 ?.firstOrNull { fido2CredentialAutofillView ->
                     fido2CredentialAutofillView.cipherId == it.id
                 },
-            isPremiumUser = premiumStatus,
+            isPremiumUser = isPremiumUser,
             isTotp = isTotp,
         )
     }

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt
@@ -38,7 +38,6 @@ import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelayManager
 import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction
 import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterData
 import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
-import com.x8bit.bitwarden.ui.vault.feature.vault.util.getOrganizationPremiumStatusMap
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.initials
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toAccountSummaries
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toActiveAccountSummary
@@ -105,9 +104,6 @@ class VaultViewModel @Inject constructor(
             isRefreshing = false,
             showImportActionCard = false,
             showSshKeys = showSshKeys,
-            organizationPremiumStatusMap = userState
-                .activeAccount
-                .getOrganizationPremiumStatusMap(),
         )
     },
 ) {
@@ -634,7 +630,6 @@ class VaultViewModel @Inject constructor(
                     hasMasterPassword = state.hasMasterPassword,
                     vaultFilterType = vaultFilterTypeOrDefault,
                     showSshKeys = showSshKeys,
-                    organizationPremiumStatusMap = state.organizationPremiumStatusMap,
                 ),
                 dialog = null,
                 isRefreshing = false,
@@ -673,7 +668,6 @@ class VaultViewModel @Inject constructor(
                     hasMasterPassword = state.hasMasterPassword,
                     vaultFilterType = vaultFilterTypeOrDefault,
                     showSshKeys = state.showSshKeys,
-                    organizationPremiumStatusMap = state.organizationPremiumStatusMap,
                 ),
             )
         }
@@ -745,7 +739,6 @@ data class VaultState(
     val isRefreshing: Boolean,
     val showImportActionCard: Boolean,
     val showSshKeys: Boolean,
-    val organizationPremiumStatusMap: Map<String, Boolean>,
 ) : Parcelable {
 
     /**
@@ -1375,7 +1368,6 @@ private fun MutableStateFlow<VaultState>.updateToErrorStateOrDialog(
                     vaultFilterType = vaultFilterType,
                     isIconLoadingDisabled = isIconLoadingDisabled,
                     showSshKeys = it.showSshKeys,
-                    organizationPremiumStatusMap = it.organizationPremiumStatusMap,
                 ),
                 dialog = VaultState.DialogState.Error(
                     title = errorTitle,

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt
@@ -71,11 +71,3 @@ fun UserState.Account.toVaultFilterData(
                 ),
             )
         }
-
-/**
- * Returns a map of organization IDs and if they provide a premium status to the user for
- * items owned by that organization.
- */
-fun UserState.Account.getOrganizationPremiumStatusMap(): Map<String, Boolean> {
-    return organizations.associate { it.id to it.shouldUsersGetPremium }
-}
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt
@@ -40,7 +40,6 @@ fun VaultData.toViewState(
     baseIconUrl: String,
     vaultFilterType: VaultFilterType,
     showSshKeys: Boolean,
-    organizationPremiumStatusMap: Map<String, Boolean>,
 ): VaultState.ViewState {
 
     val filteredCipherViewListWithDeletedItems =
@@ -74,22 +73,14 @@ fun VaultData.toViewState(
     return if (filteredCipherViewListWithDeletedItems.isEmpty()) {
         VaultState.ViewState.NoItems
     } else {
-        val totpItemsGroupedByOwnership = filteredCipherViewList.groupBy {
-            !it.organizationId.isNullOrBlank()
-        }
-        val userOwnedTotpItems = totpItemsGroupedByOwnership[false]
-            ?.filter {
-                it.login?.totp != null && isPremium
-            }.orEmpty()
-        val organizationOwnedTotpItems = totpItemsGroupedByOwnership[true]
-            ?.filter {
-                it.login?.totp != null &&
-                    (organizationPremiumStatusMap[it.id] == true || it.organizationUseTotp)
-            }.orEmpty()
+        val totpItems = filteredCipherViewList.filter { it.login?.totp != null }
         VaultState.ViewState.Content(
             itemTypesCount = itemTypesCount,
-            totpItemsCount = userOwnedTotpItems.count() +
-                organizationOwnedTotpItems.count(),
+            totpItemsCount = if (isPremium) {
+                totpItems.count()
+            } else {
+                totpItems.count { it.organizationUseTotp }
+            },
             loginItemsCount = filteredCipherViewList.count { it.type == CipherType.LOGIN },
             cardItemsCount = filteredCipherViewList.count { it.type == CipherType.CARD },
             identityItemsCount = filteredCipherViewList.count { it.type == CipherType.IDENTITY },
@@ -103,8 +94,7 @@ fun VaultData.toViewState(
                         hasMasterPassword = hasMasterPassword,
                         isIconLoadingDisabled = isIconLoadingDisabled,
                         baseIconUrl = baseIconUrl,
-                        isPremiumUser = organizationPremiumStatusMap[it.organizationId]
-                            ?: isPremium,
+                        isPremiumUser = isPremium,
                     )
                 },
             folderItems = filteredFolderViewList
@@ -138,8 +128,7 @@ fun VaultData.toViewState(
                         hasMasterPassword = hasMasterPassword,
                         isIconLoadingDisabled = isIconLoadingDisabled,
                         baseIconUrl = baseIconUrl,
-                        isPremiumUser = organizationPremiumStatusMap[it.organizationId]
-                            ?: isPremium,
+                        isPremiumUser = isPremium,
                     )
                 }
                 .takeIf { it.size < NO_FOLDER_ITEM_THRESHOLD }

diff --git a/...n/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt b/...n/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt
@@ -18,7 +18,6 @@ import com.x8bit.bitwarden.ui.platform.base.util.asText
 import com.x8bit.bitwarden.ui.platform.base.util.concat
 import com.x8bit.bitwarden.ui.platform.components.model.IconData
 import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
-import com.x8bit.bitwarden.ui.vault.feature.vault.util.getOrganizationPremiumStatusMap
 import com.x8bit.bitwarden.ui.vault.feature.vault.util.toLoginIconData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
@@ -320,11 +319,8 @@ class VerificationCodeViewModel @Inject constructor(
         authCodes: List<VerificationCodeItem>,
         userAccount: UserState.Account?,
     ): DataState<List<VerificationCodeItem>> {
-        val orgPremiumStatusMap = userAccount?.getOrganizationPremiumStatusMap().orEmpty()
         val filteredAuthCodes = authCodes.mapNotNull { authCode ->
-            val premiumStatus =
-                (authCode.orgId?.let { orgPremiumStatusMap[it] } ?: userAccount?.isPremium) == true
-            if (premiumStatus) {
+            if (userAccount?.isPremium == true) {
                 authCode
             } else {
                 authCode.takeIf { it.orgUsesTotp }