fix(realtime_client, supabase): pass apikey as the initial access tok…

…en for realtime client (#596) * pass apikey as the initial access token for realtime client * ignore lint error for new AppLifecycleState
supabase · Aug 22, 2023 · af8e368 · af8e368
1 parent a349ae0
commit af8e368
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/packages/realtime_client/lib/src/realtime_client.dart b/packages/realtime_client/lib/src/realtime_client.dart
@@ -104,7 +104,8 @@ class RealtimeClient {
       eventsPerSecondLimitMs = (1000 / int.parse(eventsPerSecond)).floor();
     }
 
-    accessToken = this.headers['Authorization']?.split(' ').last;
+    final customJWT = this.headers['Authorization']?.split(' ').last;
+    accessToken = customJWT ?? params['apikey'];
 
     this.reconnectAfterMs =
         reconnectAfterMs ?? RetryTimer.createRetryFunction();

diff --git a/packages/realtime_client/test/socket_test.dart b/packages/realtime_client/test/socket_test.dart
@@ -39,7 +39,8 @@ void main() {
 
   group('constructor', () {
     test('sets defaults', () async {
-      final socket = RealtimeClient('wss://example.com/socket');
+      final socket =
+          RealtimeClient('wss://example.com/socket', params: {'apikey': '123'});
       expect(socket.channels.length, 0);
       expect(socket.sendBuffer.length, 0);
       expect(socket.ref, 0);
@@ -65,6 +66,7 @@ void main() {
         socket.headers['X-Client-Info']!.split('/').first,
         'realtime-dart',
       );
+      expect(socket.accessToken, '123');
     });
 
     test('overrides some defaults with options', () async {

diff --git a/packages/supabase/test/client_test.dart b/packages/supabase/test/client_test.dart
@@ -55,6 +55,10 @@ void main() {
         containsPair('log_level', 'info'),
       );
     });
+
+    test('realtime access token is set properly', () {
+      expect(client.realtime.accessToken, supabaseKey);
+    });
   });
 
   group('auth', () {

diff --git a/packages/supabase_flutter/lib/src/supabase_auth.dart b/packages/supabase_flutter/lib/src/supabase_auth.dart
@@ -159,6 +159,7 @@ class SupabaseAuth with WidgetsBindingObserver {
 
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
+    // ignore:missing_enum_constant_in_switch
     switch (state) {
       case AppLifecycleState.resumed:
         _recoverSupabaseSession();