Revert, fetch JWT and payload data only after connection

PlugFox · Jul 27, 2023 · cd69c87 · cd69c87
1 parent afbffb9
commit cd69c87
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 49 deletions.
diff --git a/lib/src/client/centrifuge.dart b/lib/src/client/centrifuge.dart
@@ -126,9 +126,7 @@ base mixin CentrifugeConnectionMixin on CentrifugeBase, CentrifugeErrorsMixin {
   Future<void> connect(String url) async {
     logger.fine('Interactively connecting to $url');
     try {
-      final token = await _config.getToken?.call();
-      final payload = await _config.getPayload?.call();
-      await _transport.connect(url: url, token: token, payload: payload);
+      await _transport.connect(url);
     } on CentrifugeException catch (error, stackTrace) {
       _emitError(error, stackTrace);
       rethrow;

diff --git a/lib/src/transport/transport_interface.dart b/lib/src/transport/transport_interface.dart
@@ -18,11 +18,7 @@ abstract interface class ICentrifugeTransport {
   /// Connect to the server.
   /// [url] is a URL of endpoint.
   /// {@nodoc}
-  Future<void> connect({
-    required String url,
-    required String? token,
-    required List<int>? payload,
-  });
+  Future<void> connect(String url);
 
   /// Send asynchronous message to a server. This method makes sense
   /// only when using Centrifuge library for Go on a server side. In Centrifuge

diff --git a/lib/src/transport/ws_protobuf_transport.dart b/lib/src/transport/ws_protobuf_transport.dart
@@ -69,11 +69,7 @@ abstract base class CentrifugeWSPBTransportBase
 
   @override
   @mustCallSuper
-  Future<void> connect({
-    required String url,
-    required String? token,
-    required List<int>? payload,
-  }) async {}
+  Future<void> connect(String url) async {}
 
   @override
   @mustCallSuper
@@ -309,21 +305,15 @@ base mixin CentrifugeWSPBConnectionMixin
         CentrifugeWSPBSenderMixin,
         CentrifugeWSPBStateHandlerMixin {
   @override
-  Future<void> connect({
-    required String url,
-    required String? token,
-    required List<int>? payload,
-  }) async {
+  Future<void> connect(String url) async {
     try {
-      await super.connect(
-        url: url,
-        token: token,
-        payload: payload,
-      );
+      await super.connect(url);
       await _webSocket.connect(url);
       final request = pb.ConnectRequest();
+      final token = await _config.getToken?.call();
       assert(token == null || token.length > 5, 'Centrifuge JWT is too short');
       if (token != null) request.token = token;
+      final payload = await _config.getPayload?.call();
       if (payload != null) request.data = payload;
       request
         ..name = _config.client.name
@@ -443,23 +433,15 @@ base mixin CentrifugeWSPBStateHandlerMixin
   }
 
   @override
-  Future<void> connect({
-    required String url,
-    required String? token,
-    required List<int>? payload,
-  }) {
+  Future<void> connect(String url) {
     // Change state to connecting before connection.
     _setState(CentrifugeState$Connecting(url: url));
     // Subscribe to websocket state after initialization.
     _webSocketClosedStateSubscription ??= _webSocket.stateChanges.closed.listen(
       _handleWebSocketClosedStates,
       cancelOnError: false,
     );
-    return super.connect(
-      url: url,
-      token: token,
-      payload: payload,
-    );
+    return super.connect(url);
   }
 
   @override
@@ -488,21 +470,13 @@ base mixin CentrifugeWSPBHandlerMixin
   StreamSubscription<List<int>>? _webSocketMessageSubscription;
 
   @override
-  Future<void> connect({
-    required String url,
-    required String? token,
-    required List<int>? payload,
-  }) {
+  Future<void> connect(String url) {
     // Subscribe to websocket messages after first connection.
     _webSocketMessageSubscription ??= _webSocket.stream.bytes.listen(
       _handleWebSocketMessage,
       cancelOnError: false,
     );
-    return super.connect(
-      url: url,
-      token: token,
-      payload: payload,
-    );
+    return super.connect(url);
   }
 
   /// {@nodoc}
@@ -590,13 +564,9 @@ base mixin CentrifugeWSPBPingPongMixin on CentrifugeWSPBTransportBase {
   Timer? _pingTimer;
 
   @override
-  Future<void> connect({
-    required String url,
-    required String? token,
-    required List<int>? payload,
-  }) async {
+  Future<void> connect(String url) async {
     _tearDownPingTimer();
-    await super.connect(url: url, token: token, payload: payload);
+    await super.connect(url);
     _restartPingTimer();
   }