[PR #6383] [PM-28470] Implement revoke from organization #12679

Closed
opened 2026-04-11 03:49:05 -05:00 by GiteaMirror · 0 comments
Owner

Original Pull Request: https://github.com/bitwarden/android/pull/6383

State: closed
Merged: Yes


🎟️ Tracking

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

📔 Objective

Added new Revoke from Organization endpoint, replaced leaveOrganization with RevokeFromOrganization endpoint.
Wired navigation from MigrateToMyItemsViewModel to the LeaveOrganizationViewModel

AuthenticatedOrganizationApi.kt - Added revokeFromOrganization endpoint
OrganizationService.kt - Added service interface method
OrganizationServiceImpl.kt - Added service implementation
AuthRepository.kt - Added revokeFromOrganization interface method
AuthRepositoryImpl.kt - Added repository implementation (no longer has leaveOrganization removed - both exist!)
VaultMigrationManager.kt - Added clearMigrationState() method
VaultMigrationManagerImpl.kt - Implemented clearMigrationState()
LeaveOrganizationViewModel.kt - Calls clearMigrationState() on success
MigrateToMyItemsViewModel.kt - Removed unused OrganizationService dependency
MigrateToMyItemsScreen.kt - Updated callback signature to accept org params
MigrateToMyItemsNavigation.kt - Updated destination signature
VaultUnlockedNavigation.kt - Wired up navigation to LeaveOrganization with params
VaultMigrationManagerTest.kt - Added test for clearMigrationState()
LeaveOrganizationViewModelTest.kt - Added verification for state clearing
MigrateToMyItemsViewModelTest.kt - Fixed event structure tests
MigrateToMyItemsScreenTest.kt - Updated callback signatures

📸 Screenshots

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) 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
**Original Pull Request:** https://github.com/bitwarden/android/pull/6383 **State:** closed **Merged:** Yes --- ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-28470 ## 📔 Objective Added new Revoke from Organization endpoint, replaced leaveOrganization with RevokeFromOrganization endpoint. Wired navigation from MigrateToMyItemsViewModel to the LeaveOrganizationViewModel **AuthenticatedOrganizationApi.kt** - Added revokeFromOrganization endpoint **OrganizationService.kt** - Added service interface method **OrganizationServiceImpl.kt** - Added service implementation **AuthRepository.kt** - Added revokeFromOrganization interface method **AuthRepositoryImpl.kt** - Added repository implementation (no longer has leaveOrganization removed - both exist!) **VaultMigrationManager.kt** - Added clearMigrationState() method **VaultMigrationManagerImpl.kt** - Implemented clearMigrationState() **LeaveOrganizationViewModel.kt** - Calls clearMigrationState() on success **MigrateToMyItemsViewModel.kt** - Removed unused OrganizationService dependency **MigrateToMyItemsScreen.kt** - Updated callback signature to accept org params **MigrateToMyItemsNavigation.kt** - Updated destination signature **VaultUnlockedNavigation.kt** - Wired up navigation to LeaveOrganization with params **VaultMigrationManagerTest.kt** - Added test for clearMigrationState() **LeaveOrganizationViewModelTest.kt** - Added verification for state clearing **MigrateToMyItemsViewModelTest.kt** - Fixed event structure tests **MigrateToMyItemsScreenTest.kt** - Updated callback signatures ## 📸 Screenshots <!-- Required for any UI changes; delete if not applicable. Use fixed width images for better display. --> ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) 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
GiteaMirror added the pull-request label 2026-04-11 03:49:05 -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#12679