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 #6447] [MERGED] [PM-31446] fix:Append assetlinks.json path to DAL URLs #59341

New Issue
Closed
opened 2026-05-11 04:54:33 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-11 04:54:33 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6447
Author: @SaintPatrck
Created: 1/30/2026
Status: ✅ Merged
Merged: 1/30/2026
Merged by: @SaintPatrck

Base: main ← Head: PM-31446/fix-dal-url-to-sdk

📝 Commits (1)

  • d1fe001 [PM-31446] fix:Append assetlinks.json path to DAL URLs

📊 Changes

2 files changed (+14 additions, -4 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/BitwardenCredentialManagerImpl.kt (+11 -2)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/credentials/manager/BitwardenCredentialManagerTest.kt (+3 -2)

📄 Description

🎟️ Tracking

PM-31446
Relates to https://github.com/bitwarden/sdk-internal/pull/606

📔 Objective

Ensures that the Digital Asset Link (DAL) URL passed to the Origin constructor always correctly points to the assetlinks.json file as required by the latest SDK version.

A private helper function toDigitalAssetLinkUrl() has been introduced to consistently append /.well-known/assetlinks.json to the host URL. This logic is now used in both the createCredential and getCredential flows when constructing the Origin.App object.

This change fixes a subtle bug where the DAL verification might fail if the host URL did not explicitly point to the assetlinks.json file.

Specific changes:

  • Added a DAL_ROUTE constant for .well-known/assetlinks.json.
  • Implemented the toDigitalAssetLinkUrl() extension function to append the DAL route to a given host string, handling cases with and without trailing slashes.
  • Updated calls in createCredential and getCredential to use this new helper function for constructing the assetLinkUrl.
  • Adjusted unit tests in BitwardenCredentialManagerTest to reflect the corrected, fully-formed assetLinkUrl.

📸 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

🔄 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/6447 **Author:** [@SaintPatrck](https://github.com/SaintPatrck) **Created:** 1/30/2026 **Status:** ✅ Merged **Merged:** 1/30/2026 **Merged by:** [@SaintPatrck](https://github.com/SaintPatrck) **Base:** `main` ← **Head:** `PM-31446/fix-dal-url-to-sdk` --- ### 📝 Commits (1) - [`d1fe001`](https://github.com/bitwarden/android/commit/d1fe00114ffd4dda9ae0a42de7be770b934ce00d) [PM-31446] fix:Append assetlinks.json path to DAL URLs ### 📊 Changes **2 files changed** (+14 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/credentials/manager/BitwardenCredentialManagerImpl.kt` (+11 -2) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/credentials/manager/BitwardenCredentialManagerTest.kt` (+3 -2) </details> ### 📄 Description ## 🎟️ Tracking PM-31446 Relates to https://github.com/bitwarden/sdk-internal/pull/606 ## 📔 Objective Ensures that the Digital Asset Link (DAL) URL passed to the `Origin` constructor always correctly points to the `assetlinks.json` file as required by the latest SDK version. A private helper function `toDigitalAssetLinkUrl()` has been introduced to consistently append `/.well-known/assetlinks.json` to the host URL. This logic is now used in both the `createCredential` and `getCredential` flows when constructing the `Origin.App` object. This change fixes a subtle bug where the DAL verification might fail if the host URL did not explicitly point to the `assetlinks.json` file. Specific changes: - Added a `DAL_ROUTE` constant for `.well-known/assetlinks.json`. - Implemented the `toDigitalAssetLinkUrl()` extension function to append the DAL route to a given host string, handling cases with and without trailing slashes. - Updated calls in `createCredential` and `getCredential` to use this new helper function for constructing the `assetLinkUrl`. - Adjusted unit tests in `BitwardenCredentialManagerTest` to reflect the corrected, fully-formed `assetLinkUrl`. ## 📸 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 --- <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-11 04:54:33 -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#59341
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?