Merge branch 'develop' into overlay-portal

packages/stream_chat/lib/src/client/client.dart

@@ -143,9 +143,6 @@ class StreamChatClient {
 
   late final RetryPolicy _retryPolicy;
 
-  /// sync state of the channels present inside state, defaults to false
-  bool _synced = false;
-
   /// the last dateTime at the which all the channels were synced
   DateTime? _lastSyncedAt;
 
@@ -406,10 +403,6 @@ class StreamChatClient {
     if (event.type == EventType.healthCheck) {
       return _handleHealthCheckEvent(event);
     }
-    if (!event.isLocal && _synced) {
-      _lastSyncedAt = event.createdAt;
-      _chatPersistenceClient?.updateLastSyncAt(event.createdAt);
-    }
     state.updateUser(event.user);
     return _eventController.add(event);
   }
@@ -438,8 +431,6 @@ class StreamChatClient {
         type: EventType.connectionRecovered,
         online: true,
       ));
-    } else {
-      _synced = false;
     }
   }
 
@@ -464,13 +455,11 @@ class StreamChatClient {
   Future<void> sync({List<String>? cids, DateTime? lastSyncAt}) async {
     cids ??= await _chatPersistenceClient?.getChannelCids();
     if (cids == null || cids.isEmpty) {
-      _synced = true;
       return;
     }
 
     lastSyncAt ??= await _chatPersistenceClient?.getLastSyncAt();
     if (lastSyncAt == null) {
-      _synced = true;
       return;
     }
 
@@ -488,12 +477,10 @@ class StreamChatClient {
         handleEvent(event);
       }
 
-      _synced = true;
       final now = DateTime.now();
       _lastSyncedAt = now;
       _chatPersistenceClient?.updateLastSyncAt(now);
     } catch (e, stk) {
-      _synced = false;
       logger.severe('Error during sync', e, stk);
     }
   }
@@ -1325,6 +1312,7 @@ class StreamChatClient {
     // resetting state
     state.dispose();
     state = ClientState(this);
+    _lastSyncedAt = null;
 
     // resetting credentials
     _tokenManager.reset();

packages/stream_chat/lib/src/client/retry_queue.dart

@@ -6,8 +6,8 @@ import 'package:rxdart/rxdart.dart';
 import 'package:stream_chat/src/client/channel.dart';
 import 'package:stream_chat/src/client/retry_policy.dart';
 import 'package:stream_chat/src/core/error/error.dart';
-import 'package:stream_chat/src/event_type.dart';
 import 'package:stream_chat/src/core/models/message.dart';
+import 'package:stream_chat/src/event_type.dart';
 import 'package:stream_chat/stream_chat.dart';
 
 /// The retry queue associated to a channel

packages/stream_chat/lib/src/core/http/token.dart

@@ -46,12 +46,16 @@ class Token extends Equatable {
   /// Creates a [Token] instance from the provided [rawValue] if it's valid.
   factory Token.fromRawValue(String rawValue) {
     final jwtBody = JsonWebToken.unverified(rawValue);
-    final userId = jwtBody.claims.getTyped<String>('user_id');
+    final userId = jwtBody.claims.getTyped('user_id');
     assert(
       userId != null,
       'Invalid `token`, It should contain `user_id`',
     );
-    return Token._(rawValue: rawValue, userId: userId!, authType: AuthType.jwt);
+    return Token._(
+      rawValue: rawValue,
+      userId: userId!.toString(),
+      authType: AuthType.jwt,
+    );
   }
 
   /// The token which can be used during the development.

packages/stream_chat/lib/src/core/models/channel_model.dart

@@ -1,7 +1,7 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stream_chat/src/core/models/channel_config.dart';
-import 'package:stream_chat/src/core/util/serializer.dart';
 import 'package:stream_chat/src/core/models/user.dart';
+import 'package:stream_chat/src/core/util/serializer.dart';
 
 part 'channel_model.g.dart';
 

packages/stream_chat/lib/src/core/models/own_user.dart

@@ -54,8 +54,6 @@ class OwnUser extends User {
   factory OwnUser.fromUser(User user) => OwnUser(
         id: user.id,
         role: user.role,
-        name: user.name,
-        image: user.image,
         createdAt: user.createdAt,
         updatedAt: user.updatedAt,
         lastActive: user.lastActive,
@@ -116,8 +114,6 @@ class OwnUser extends User {
     return copyWith(
       id: other.id,
       role: other.role,
-      name: other.name,
-      image: other.image,
       banned: other.banned,
       channelMutes: other.channelMutes,
       createdAt: other.createdAt,

packages/stream_chat/lib/src/core/models/reaction.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:stream_chat/src/core/util/serializer.dart';
 import 'package:stream_chat/src/core/models/user.dart';
+import 'package:stream_chat/src/core/util/serializer.dart';
 
 part 'reaction.g.dart';
 

packages/stream_chat/lib/src/ws/websocket.dart

@@ -6,15 +6,15 @@ import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:stream_chat/src/core/error/error.dart';
-import 'package:stream_chat/src/ws/connection_status.dart';
 import 'package:stream_chat/src/core/http/token.dart';
 import 'package:stream_chat/src/core/http/token_manager.dart';
 import 'package:stream_chat/src/core/models/event.dart';
 import 'package:stream_chat/src/core/models/user.dart';
 import 'package:stream_chat/src/event_type.dart';
+import 'package:stream_chat/src/ws/connection_status.dart';
 import 'package:stream_chat/src/ws/timer_helper.dart';
-import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:web_socket_channel/status.dart' as status;
+import 'package:web_socket_channel/web_socket_channel.dart';
 
 /// Typedef which exposes an [Event] as the only parameter.
 typedef EventHandler = void Function(Event);