[PR #4390] [MERGED] PM-14995 Hide TOTP for non premium org items even if individual user has premium account #42006

Closed
opened 2026-04-23 20:42:25 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4390
Author: @dseverns-livefront
Created: 11/26/2024
Status: Merged
Merged: 12/2/2024
Merged by: @dseverns-livefront

Base: mainHead: PM-14995-premium-org-hide-totp


📝 Commits (2)

  • f311a8f PM-14995 check for org ownership and premium status on items with TOTP function
  • 129fa27 orEmpty() + formtatting

📊 Changes

39 files changed (+317 additions, -54 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerImpl.kt (+9 -1)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt (+1 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt (+6 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt (+5 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt (+14 -8)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt (+7 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt (+5 -1)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt (+8 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt (+8 -0)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt (+19 -8)
📝 app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt (+5 -1)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+3 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt (+6 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt (+3 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt (+16 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerTest.kt (+35 -0)
📝 app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt (+4 -2)

...and 19 more files

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-14995

📔 Objective

  • A user with premium should not be able to use TOTP codes on items held by a non premium organization.

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/4390 **Author:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Created:** 11/26/2024 **Status:** ✅ Merged **Merged:** 12/2/2024 **Merged by:** [@dseverns-livefront](https://github.com/dseverns-livefront) **Base:** `main` ← **Head:** `PM-14995-premium-org-hide-totp` --- ### 📝 Commits (2) - [`f311a8f`](https://github.com/bitwarden/android/commit/f311a8f547e4bd785c352441a50c7bf9ca053021) PM-14995 check for org ownership and premium status on items with TOTP function - [`129fa27`](https://github.com/bitwarden/android/commit/129fa274edde7f3f270c3018247d46d5243cd454) orEmpty() + formtatting ### 📊 Changes **39 files changed** (+317 additions, -54 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerImpl.kt` (+9 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/manager/TotpCodeManagerImpl.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/data/vault/manager/model/VerificationCodeItem.kt` (+1 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt` (+6 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt` (+5 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt` (+14 -8) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt` (+7 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt` (+5 -1) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt` (+8 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/UserStateExtensions.kt` (+8 -0) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt` (+19 -8) 📝 `app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt` (+5 -1) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+3 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/AuthDiskSourceExtensionsTest.kt` (+6 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt` (+3 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/auth/repository/util/UserStateJsonExtensionsTest.kt` (+16 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/autofill/manager/AutofillTotpManagerTest.kt` (+35 -0) 📝 `app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/CipherViewUtil.kt` (+4 -2) _...and 19 more files_ </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-14995 <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective - A user with premium should not be able to use TOTP codes on items held by a non premium organization. <!-- Describe what the purpose of this PR is, for example what bug you're fixing or new feature you're adding. --> ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-23 20:42:25 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#42006