github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-07 19:39:41 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

[PR #6498] [MERGED] PM-31953: Support multiple schemes for Duo, WebAuthn, and SSO callbacks #54839

New Issue
Closed
opened 2026-05-01 20:36:20 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-01 20:36:20 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6498
Author: @david-livefront
Created: 2/9/2026
Status: ✅ Merged
Merged: 2/10/2026
Merged by: @david-livefront

Base: main ← Head: app-links-setup

📝 Commits (1)

  • 1a27b2a PM-31953: Support multiple schemes for Duo, WebAuthn, and SSO callbacks

📊 Changes

28 files changed (+608 additions, -157 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt (+2 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/DuoUtils.kt (+2 -5)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtils.kt (+6 -8)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtils.kt (+8 -12)
➕ app/src/main/kotlin/com/x8bit/bitwarden/data/platform/util/EnvironmentUrlDataJsonExtensions.kt (+51 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt (+1 -1)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt (+23 -14)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt (+2 -2)
📝 app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt (+81 -61)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+92 -5)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtilsTest.kt (+3 -1)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtilsTest.kt (+10 -9)
➕ app/src/test/kotlin/com/x8bit/bitwarden/data/platform/util/EnvironmentUrlDataJsonExtensionsTest.kt (+122 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt (+5 -4)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModelTest.kt (+19 -11)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt (+8 -7)
📝 app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt (+18 -7)
📝 data/src/main/kotlin/com/bitwarden/data/datasource/disk/model/EnvironmentUrlDataJson.kt (+12 -1)
📝 data/src/main/kotlin/com/bitwarden/data/repository/model/EnvironmentRegion.kt (+1 -0)
📝 data/src/main/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlDataJsonExtensions.kt (+32 -5)

...and 8 more files

📄 Description

🎟️ Tracking

PM-31953

📔 Objective

This PR lays all the groundwork for supporting Universal links when logging in via Duo, WebAuthn, and SSO.

Notably, this PR does not actually change the app to use the universal links as all variants still use the bitwarden schemed deeplink. A future PR will make the final transition to universal links.

Changes in this PR:

  • Send the deeplinkScheme to all requests to getToken
  • Allow for parsing of deeplinks from bitwarden.pw
  • Sending an appropriate deeplinkScheme when launching an AuthTab
  • Abstract launching an AuthTab with a universal link or a custom deeplink.

⏰ 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

🔄 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/6498 **Author:** [@david-livefront](https://github.com/david-livefront) **Created:** 2/9/2026 **Status:** ✅ Merged **Merged:** 2/10/2026 **Merged by:** [@david-livefront](https://github.com/david-livefront) **Base:** `main` ← **Head:** `app-links-setup` --- ### 📝 Commits (1) - [`1a27b2a`](https://github.com/bitwarden/android/commit/1a27b2a5381694c97ef726263f3016df9c47fea8) PM-31953: Support multiple schemes for Duo, WebAuthn, and SSO callbacks ### 📊 Changes **28 files changed** (+608 additions, -157 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryImpl.kt` (+2 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/DuoUtils.kt` (+2 -5) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtils.kt` (+6 -8) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtils.kt` (+8 -12) ➕ `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/util/EnvironmentUrlDataJsonExtensions.kt` (+51 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt` (+1 -1) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModel.kt` (+23 -14) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt` (+2 -2) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModel.kt` (+81 -61) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+92 -5) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SsoUtilsTest.kt` (+3 -1) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/util/WebAuthUtilsTest.kt` (+10 -9) ➕ `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/util/EnvironmentUrlDataJsonExtensionsTest.kt` (+122 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt` (+5 -4) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnViewModelTest.kt` (+19 -11) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreenTest.kt` (+8 -7) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginViewModelTest.kt` (+18 -7) 📝 `data/src/main/kotlin/com/bitwarden/data/datasource/disk/model/EnvironmentUrlDataJson.kt` (+12 -1) 📝 `data/src/main/kotlin/com/bitwarden/data/repository/model/EnvironmentRegion.kt` (+1 -0) 📝 `data/src/main/kotlin/com/bitwarden/data/repository/util/EnvironmentUrlDataJsonExtensions.kt` (+32 -5) _...and 8 more files_ </details> ### 📄 Description ## 🎟️ Tracking [PM-31953](https://bitwarden.atlassian.net/browse/PM-31953) ## 📔 Objective This PR lays all the groundwork for supporting Universal links when logging in via Duo, WebAuthn, and SSO. Notably, this PR does not actually change the app to use the universal links as all variants still use the `bitwarden` schemed deeplink. A future PR will make the final transition to universal links. Changes in this PR: * Send the `deeplinkScheme` to all requests to `getToken` * Allow for parsing of deeplinks from `bitwarden.pw` * Sending an appropriate `deeplinkScheme` when launching an AuthTab * Abstract launching an AuthTab with a universal link or a custom deeplink. ## ⏰ 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 [PM-31953]: https://bitwarden.atlassian.net/browse/PM-31953?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-05-01 20:36:20 -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#54839
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?