Merge branch 'develop' into overlay-portal

2021-09-29 17:34:30 +02:00
parent aa6fc06402 2ce209bed0
commit 148ab9871b
82 changed files with 347 additions and 233 deletions
@@ -1,5 +1,11 @@
 ## Upcoming

+🐞 Fixed
+
+- [[#710]](https://github.com/GetStream/stream-chat-flutter/issues/710) Fixed JWT requiring using `String` as id.
+
+## 3.0.0
+
 🛑️ Breaking Changes from `2.2.1`

 - Added 6 new methods in `ChatPersistenceClient`.
@@ -16,13 +22,16 @@
 - Added support for `next`, `previous` value pagination in `client.search`
  , [read more.](https://getstream.io/chat/docs/other-rest/search/#pagination)
 - `Attachment` class now has a `fileSize` and `mimeType` property. Setting a `file` will also set the `file_size`
-  , `mime_type` key on `extraData`, so `attachment.fileSize`, `attachment.mimetype` and `attachment.extraData['file_size']`
+  , `mime_type` key on `extraData`, so `attachment.fileSize`, `attachment.mimetype`
+  and `attachment.extraData['file_size']`
  , `attachment.extraData['mime_type]` is same respectively.

 🐞 Fixed

 - [[#659]](https://github.com/GetStream/stream-chat-flutter/issues/659) Fixed unread count not updating correctly.
 - Fix `Filter.empty()` json encoding.
+- [[#700]](https://github.com/GetStream/stream-chat-flutter/issues/700) Connecting user without providing `name`
+  uses `id` instead for setting `user.name`.

 ## 2.2.1

@@ -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();
@@ -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
@@ -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.
@@ -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';

@@ -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,
@@ -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';

@@ -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);
@@ -3,4 +3,4 @@ import 'package:stream_chat/src/client/client.dart';
 /// Current package version
 /// Used in [StreamChatClient] to build the `x-stream-client` header
 // ignore: constant_identifier_names
-const PACKAGE_VERSION = '2.2.1';
+const PACKAGE_VERSION = '3.0.0';
@@ -1,7 +1,7 @@
 name: stream_chat
 homepage: https://getstream.io/
 description: The official Dart client for Stream Chat, a service for building chat applications.
-version: 2.2.1
+version: 3.0.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues

@@ -1,6 +1,5 @@
 import 'dart:convert';

-import 'package:test/test.dart';
 import 'package:stream_chat/src/core/api/responses.dart';
 import 'package:stream_chat/src/core/models/device.dart';
 import 'package:stream_chat/src/core/models/member.dart';
@@ -8,6 +7,7 @@ import 'package:stream_chat/src/core/models/message.dart';
 import 'package:stream_chat/src/core/models/reaction.dart';
 import 'package:stream_chat/src/core/models/read.dart';
 import 'package:stream_chat/stream_chat.dart';
+import 'package:test/test.dart';

 void main() {
  group('src/api/responses', () {
@@ -1,7 +1,7 @@
 import 'dart:convert';

-import 'package:test/test.dart';
 import 'package:stream_chat/src/core/models/filter.dart';
+import 'package:test/test.dart';

 void main() {
  group('operators', () {
@@ -175,5 +175,26 @@ void main() {
      expect(newUser.teams, ['team1', 'team2']);
      expect(newUser.language, 'fr');
    });
+
+    test(
+      'fromUser should not override name with id if not available in extraData',
+      () {
+        final user = User(id: 'test-id');
+        expect(user.id, 'test-id');
+        expect(user.name, 'test-id');
+
+        final encodedUser = user.toJson();
+        expect(encodedUser['id'], 'test-id');
+        expect(encodedUser['name'], null);
+
+        final ownUser = OwnUser.fromUser(user);
+        expect(user.id, 'test-id');
+        expect(user.name, 'test-id');
+
+        final encodedOwnUser = ownUser.toJson();
+        expect(encodedOwnUser['id'], 'test-id');
+        expect(encodedOwnUser['name'], null);
+      },
+    );
  });
 }
@@ -1,5 +1,5 @@
-import 'package:test/test.dart';
 import 'package:stream_chat/src/core/util/serializer.dart';
+import 'package:test/test.dart';

 void main() {
  group('src/models/serialization', () {
@@ -1,5 +1,5 @@
-import 'package:test/test.dart';
 import 'package:stream_chat/src/core/util/extension.dart';
+import 'package:test/test.dart';

 void main() {
  test('`.withNullifyer` converts the type into non-nullable', () {
@@ -6,11 +6,11 @@ import 'package:rxdart/rxdart.dart';
 import 'package:stream_chat/src/core/api/channel_api.dart';
 import 'package:stream_chat/src/core/api/device_api.dart';
 import 'package:stream_chat/src/core/api/general_api.dart';
+import 'package:stream_chat/src/core/api/guest_api.dart';
 import 'package:stream_chat/src/core/api/message_api.dart';
 import 'package:stream_chat/src/core/api/moderation_api.dart';
 import 'package:stream_chat/src/core/api/stream_chat_api.dart';
 import 'package:stream_chat/src/core/api/user_api.dart';
-import 'package:stream_chat/src/core/api/guest_api.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/ws/websocket.dart';
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';

+import 'package:mocktail/mocktail.dart';
 import 'package:stream_chat/src/core/http/token_manager.dart';
+import 'package:stream_chat/src/ws/websocket.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:test/test.dart';
-import 'package:mocktail/mocktail.dart';
-import 'package:stream_chat/src/ws/websocket.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';

 import '../fakes.dart';