From 537a52953076c8e0269978418395f34766a997fb Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 20 Jun 2022 12:41:11 +0200
Subject: [PATCH] fix(llc): fix x-stream-client header

---
 packages/stream_chat/lib/src/client/client.dart      | 12 ++++++++----
 .../stream_chat_flutter/lib/src/stream_chat.dart     |  4 ++--
 .../lib/src/stream_chat_core.dart                    |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
index 20506912..0b31db9e 100644
--- a/packages/stream_chat/lib/src/client/client.dart
+++ b/packages/stream_chat/lib/src/client/client.dart
@@ -98,7 +98,9 @@ class StreamChatClient {
           tokenManager: _tokenManager,
           handler: handleEvent,
           logger: detachedLogger('🔌'),
-          queryParameters: {'X-Stream-Client': defaultUserAgent},
+          queryParameters: {
+            'X-Stream-Client': '$defaultUserAgent-$packageVersion',
+          },
         );
 
     _retryPolicy = retryPolicy ??
@@ -124,13 +126,15 @@ class StreamChatClient {
   }
 
   /// Default user agent for all requests
-  static String defaultUserAgent = 'stream-chat-dart-client-'
-      '${CurrentPlatform.name}-'
-      '${PACKAGE_VERSION.split('+')[0]}';
+  static String defaultUserAgent =
+      'stream-chat-dart-client-${CurrentPlatform.name}';
 
   /// Additional headers for all requests
   static Map<String, Object?> additionalHeaders = {};
 
+  /// The current package version
+  static const packageVersion = PACKAGE_VERSION;
+
   ChatPersistenceClient? _originalChatPersistenceClient;
 
   /// Chat persistence client
diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart
index 80176911..54bd7191 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart
@@ -109,8 +109,8 @@ class StreamChatState extends State<StreamChat> {
                 child: Builder(
                   builder: (context) {
                     StreamChatClient.additionalHeaders = {
-                      'X-Stream-Client':
-                          '${StreamChatClient.defaultUserAgent}-ui',
+                      'X-Stream-Client': '${StreamChatClient.defaultUserAgent}-'
+                          'ui-${StreamChatClient.packageVersion}',
                     };
                     return widget.child ?? const Offstage();
                   },
diff --git a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart
index 9b5f5dce..1f790763 100644
--- a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart
@@ -96,7 +96,8 @@ class StreamChatCoreState extends State<StreamChatCore>
   @override
   Widget build(BuildContext context) {
     StreamChatClient.additionalHeaders = {
-      'X-Stream-Client': '${StreamChatClient.defaultUserAgent}-core',
+      'X-Stream-Client': '${StreamChatClient.defaultUserAgent}-'
+          'core-${StreamChatClient.packageVersion}',
     };
     return widget.child;
   }