TIQR-475: Fix deeplinking issues

Tiqr · Nov 21, 2024 · b003c4f · b003c4f
1 parent 661c06e
commit b003c4f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -277,10 +277,30 @@
                     android:path="/client/mobile/external-account-linked-error"
                     android:scheme="https" />
             </intent-filter>
+
+            <!-- External account linking success -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*.eduid.nl"
+                    android:scheme="https"
+                    android:path="/client/mobile/external-account-linked"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+                <data
+                    android:scheme="eduid"
+                    android:host="*"
+                    android:path="/client/mobile/external-account-linked"
+                    tools:ignore="IntentFilterUniqueDataAttributes" />
+            </intent-filter>
         </activity>
 
         <activity
             android:name="net.openid.appauth.RedirectUriReceiverActivity"
+            tools:node="replace"
             android:exported="true">
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />

diff --git a/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt b/app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt
@@ -335,7 +335,13 @@ fun MainGraph(
         route = AccountLinked.routeWithArgs,
         deepLinks = listOf(
             navDeepLink {
-                uriPattern = AccountLinked.getUriPatternOK(baseUrl)
+                uriPattern = AccountLinked.getUriPatternInternalLinkOK(baseUrl)
+            },
+            navDeepLink {
+                uriPattern = AccountLinked.getUriPatternExternalLinkOK(baseUrl)
+            },
+            navDeepLink {
+                uriPattern = AccountLinked.getUriPatternExternalLinkOKCustomScheme()
             },
             navDeepLink {
                 uriPattern = AccountLinked.getUriPatternFailed(baseUrl)

diff --git a/app/src/main/kotlin/nl/eduid/graphs/Routes.kt b/app/src/main/kotlin/nl/eduid/graphs/Routes.kt
@@ -48,7 +48,9 @@ object RequestEduIdCreated {
 
 object AccountLinked {
     const val route = "account_linked"
-    fun getUriPatternOK(baseUrl: String) = "$baseUrl/client/mobile/account-linked"
+    fun getUriPatternInternalLinkOK(baseUrl: String) = "$baseUrl/client/mobile/account-linked"
+    fun getUriPatternExternalLinkOK(baseUrl: String) = "$baseUrl/client/mobile/external-account-linked"
+    fun getUriPatternExternalLinkOKCustomScheme() = "eduid:///client/mobile/external-account-linked"
     fun getUriPatternFailed(baseUrl: String) = "$baseUrl/client/mobile/eppn-already-linked"
     fun getUriPatternExpired(baseUrl: String) = "$baseUrl/client/mobile/expired"