github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-10 00:28:29 -05:00
Code Issues 2.2k Packages Projects Releases 127 Wiki Activity

[PR #6960] [MERGED] PM-37911: Feat: Update Organization model #120906

New Issue
Closed
opened 2026-06-09 19:21:42 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-06-09 19:21:42 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6960
Author: @david-livefront
Created: 5/21/2026
Status: ✅ Merged
Merged: 5/29/2026
Merged by: @david-livefront

Base: main ← Head: PM-37911-organization-network-model

📝 Commits (1)

  • f3f06cc PM-37911: Update Organization model

📊 Changes

15 files changed (+949 additions, -67 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt (+2 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt (+150 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModel.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt (+1 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+5 -5)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/model/OrganizationUtil.kt (+1 -1)
➕ app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/model/ProfileOrganizationUtil.kt (+176 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt (+60 -1)
➕ network/src/main/kotlin/com/bitwarden/network/model/MemberDecryptionType.kt (+36 -0)
➕ network/src/main/kotlin/com/bitwarden/network/model/ProductTierType.kt (+48 -0)
➕ network/src/main/kotlin/com/bitwarden/network/model/ProviderType.kt (+38 -0)
📝 network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt (+239 -41)
📝 network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt (+104 -7)
📝 network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt (+87 -6)

📄 Description

🎟️ Tracking

PM-37911

📔 Objective

This PR updates the Organization network model to include significantly more data. This data is required in order to match the SDK ProfileOrganization.

🔄 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/6960 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 5/21/2026 **Status:** ✅ Merged **Merged:** 5/29/2026 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `PM-37911-organization-network-model` --- ### 📝 Commits (1) - [`f3f06cc`](https://github.com/bitwarden/android/commit/f3f06cc196285c8d1c99712c6719ff04d4730dab) PM-37911: Update Organization model ### 📊 Changes **15 files changed** (+949 additions, -67 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/model/Organization.kt` (+2 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt` (+150 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordViewModel.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt` (+1 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+5 -5) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/model/OrganizationUtil.kt` (+1 -1) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/model/ProfileOrganizationUtil.kt` (+176 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensionsTest.kt` (+60 -1) ➕ `network/src/main/kotlin/com/bitwarden/network/model/MemberDecryptionType.kt` (+36 -0) ➕ `network/src/main/kotlin/com/bitwarden/network/model/ProductTierType.kt` (+48 -0) ➕ `network/src/main/kotlin/com/bitwarden/network/model/ProviderType.kt` (+38 -0) 📝 `network/src/main/kotlin/com/bitwarden/network/model/SyncResponseJson.kt` (+239 -41) 📝 `network/src/test/kotlin/com/bitwarden/network/service/SyncServiceTest.kt` (+104 -7) 📝 `network/src/testFixtures/kotlin/com/bitwarden/network/model/SyncResponseProfileUtil.kt` (+87 -6) </details> ### 📄 Description ## 🎟️ Tracking [PM-37911](https://bitwarden.atlassian.net/browse/PM-37911) ## 📔 Objective This PR updates the `Organization` network model to include significantly more data. This data is required in order to match the SDK `ProfileOrganization`. [PM-37911]: https://bitwarden.atlassian.net/browse/PM-37911?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <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-06-09 19:21:42 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#120906
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?