From 87d7143cc83f75b770cb98d74998bda217465f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bispo?= <abispo@bitwarden.com>
Date: Fri, 23 Aug 2024 14:19:19 +0100
Subject: [PATCH] [PM-6702] AppLink new redirect path (#3814)

---
 app/src/main/AndroidManifest.xml                          | 8 +++++---
 .../data/auth/util/CompleteRegistrationDataUtils.kt       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 048625232..737b5d821 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,9 +62,11 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:scheme="https" />
-                <data android:host="bitwarden.com" />
-                <data android:host="bitwarden.pw" />
-                <data android:host="bitwarden.eu" />
+
+                <data android:host="vault.bitwarden.com" />
+                <data android:host="vault.bitwarden.eu" />
+                <data android:host="*.bitwarden.pw" />
+                <data android:pathPattern="/redirect-connector.*" />
             </intent-filter>
             <intent-filter>
                 <action android:name="com.x8bit.bitwarden.fido2.ACTION_CREATE_PASSKEY" />
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/util/CompleteRegistrationDataUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/util/CompleteRegistrationDataUtils.kt
index e9ddce9f0..e1221361f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/util/CompleteRegistrationDataUtils.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/util/CompleteRegistrationDataUtils.kt
@@ -9,7 +9,7 @@ import com.x8bit.bitwarden.data.platform.manager.model.CompleteRegistrationData
  * The [CompleteRegistrationData] will be returned when present.
  */
 fun Intent.getCompleteRegistrationDataIntentOrNull(): CompleteRegistrationData? {
-    val sanitizedUriString = data.toString().replace("/#/", "/")
+    val sanitizedUriString = data.toString().replace("/redirect-connector.html#", "/")
     val uri = runCatching { Uri.parse(sanitizedUriString) }.getOrNull() ?: return null
     uri.host ?: return null
     if (uri.path != "/finish-signup") return null