notif: Query account by realm URL origin, not full URL

This fixes a potential bug, in case the server returned `realm_url` contains a trailing `/`.
zulip · Feb 7, 2025 · 4e505a7 · 4e505a7
1 parent ed357a5
commit 4e505a7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/notifications/display.dart b/lib/notifications/display.dart
@@ -468,8 +468,9 @@ class NotificationDisplayManager {
     assert(url.scheme == 'zulip' && url.host == 'notification');
     final payload = NotificationOpenPayload.parseUrl(url);
 
-    final account = globalStore.accounts.firstWhereOrNull((account) =>
-      account.realmUrl == payload.realmUrl && account.userId == payload.userId);
+    final account = globalStore.accounts.firstWhereOrNull(
+      (account) => account.realmUrl.origin == payload.realmUrl.origin
+                && account.userId == payload.userId);
     if (account == null) return null;
 
     final route = MessageListPage.buildRoute(

diff --git a/test/notifications/display_test.dart b/test/notifications/display_test.dart
@@ -1036,6 +1036,21 @@ void main() {
         eg.dmMessage(from: eg.otherUser, to: [eg.selfUser]));
     });
 
+    testWidgets('account queried by realmUrl origin component', (tester) async {
+      addTearDown(testBinding.reset);
+      await testBinding.globalStore.add(
+        eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example')),
+        eg.initialSnapshot());
+      await prepare(tester);
+
+      await checkOpenNotification(tester,
+        eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example/')),
+        eg.streamMessage());
+      await checkOpenNotification(tester,
+        eg.selfAccount.copyWith(realmUrl: Uri.parse('http://chat.example')),
+        eg.streamMessage());
+    });
+
     testWidgets('no accounts', (tester) async {
       await prepare(tester, withAccount: false);
       await openNotification(tester, eg.selfAccount, eg.streamMessage());