move the accessToken to header (#891)

Move the access_token to header in the format of 'Authorization':
'Bearer $token'

---------

Co-authored-by: Hiroshi Horie <[email protected]>

Author: xianshijing-lk

analysis_options.yaml

@@ -20,6 +20,19 @@ analyzer:
     constant_identifier_names: ignore
     no_wildcard_variable_uses: ignore
     use_super_parameters: ignore
+    avoid_print: ignore
+    use_build_context_synchronously: ignore
+    discarded_futures: ignore
+    prefer_final_locals: ignore
+    depend_on_referenced_packages: ignore
+
+    # Suppress noisy or harmless warnings
+    deprecated_member_use_from_same_package: ignore
+    unused_element_parameter: ignore
+    unintended_html_in_doc_comment: ignore
+    implementation_imports: ignore
+    invalid_runtime_check_with_js_interop_types: ignore
+    unnecessary_import: ignore
 
   # Exclude protobuf files
   exclude:

example/analysis_options.yaml

@@ -31,6 +31,12 @@ analyzer:
     constant_identifier_names: ignore
     no_wildcard_variable_uses: ignore
     use_super_parameters: ignore
+    avoid_print: ignore
+    use_build_context_synchronously: ignore
+    # TODO, fix the discarded_futures problems and re-enable the warnings
+    discarded_futures: ignore
+    prefer_final_locals: ignore
+    depend_on_referenced_packages: ignore
 
   # Exclude protobuf files
   exclude:

lib/src/core/room.dart

@@ -466,7 +466,7 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
       for (final info in event.response.otherParticipants) {
         logger.fine('Creating RemoteParticipant: sid = ${info.sid}(identity:${info.identity}) '
             'tracks:${info.tracks.map((e) => e.sid)}');
-        _getOrCreateRemoteParticipant(info.identity, info);
+        await _getOrCreateRemoteParticipant(info.identity, info);
       }
 
       if (e2eeManager != null && event.response.sifTrailer.isNotEmpty) {

lib/src/core/signal_client.dart

@@ -142,11 +142,14 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
       // Attempt to connect
       var future = _wsConnector(
         rtcUri,
-        WebSocketEventHandlers(
+        options: WebSocketEventHandlers(
           onData: _onSocketData,
           onDispose: _onSocketDispose,
           onError: _onSocketError,
         ),
+        headers: {
+          'Authorization': 'Bearer $token',
+        },
       );
       future = future.timeout(connectOptions.timeouts.connection);
       _ws = await future;
@@ -170,7 +173,12 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
           forceSecure: rtcUri.isSecureScheme,
         );
 
-        final validateResponse = await http.get(validateUri);
+        final validateResponse = await http.get(
+          validateUri,
+          headers: {
+            'Authorization': 'Bearer $token',
+          },
+        );
         if (validateResponse.statusCode != 200) {
           finalError = ConnectException(validateResponse.body,
               reason: validateResponse.statusCode >= 400

lib/src/options.dart

@@ -152,6 +152,7 @@ class RoomOptions {
     bool? dynacast,
     bool? stopLocalTrackOnUnpublish,
     E2EEOptions? e2eeOptions,
+    E2EEOptions? encryption,
     bool? fastPublish,
   }) {
     return RoomOptions(

lib/src/participant/local.dart

@@ -53,9 +53,8 @@ import '../types/other.dart';
 import '../types/participant_permissions.dart';
 import '../types/rpc.dart';
 import '../types/video_dimensions.dart';
-import 'participant.dart';
-
 import '../utils.dart' show buildStreamId, mimeTypeToVideoCodecString, Utils, compareVersions, isSVCCodec;
+import 'participant.dart';
 
 /// Represents the current participant in the room. Instance of [LocalParticipant] is automatically
 /// created after successfully connecting to a [Room] and will be accessible from [Room.localParticipant].

lib/src/publication/track_publication.dart

@@ -119,8 +119,7 @@ abstract class TrackPublication<T extends Track> extends Disposable {
   void _attachTrackListener(T track) {
     // listen for Track's muted events
     final listener = track.createListener()
-      ..on<InternalTrackMuteUpdatedEvent>(
-          (event) => _onTrackMuteUpdatedEvent(event));
+      ..on<InternalTrackMuteUpdatedEvent>((event) => _onTrackMuteUpdatedEvent(event));
     // dispose listener when the track is disposed
     track.onDispose(() => listener.dispose());
   }

lib/src/support/websocket.dart

@@ -37,11 +37,19 @@ class WebSocketEventHandlers {
   });
 }
 
-typedef WebSocketConnector = Future<LiveKitWebSocket> Function(Uri uri, [WebSocketEventHandlers? options]);
+typedef WebSocketConnector = Future<LiveKitWebSocket> Function(
+  Uri uri, {
+  WebSocketEventHandlers? options,
+  Map<String, String>? headers,
+});
 
 abstract class LiveKitWebSocket extends Disposable {
   void send(List<int> data);
 
-  static Future<LiveKitWebSocket> connect(Uri uri, [WebSocketEventHandlers? options]) =>
-      lkWebSocketConnect(uri, options);
+  static Future<LiveKitWebSocket> connect(
+    Uri uri, {
+    WebSocketEventHandlers? options,
+    Map<String, String>? headers,
+  }) =>
+      lkWebSocketConnect(uri, options: options, headers: headers);
 }

lib/src/support/websocket/io.dart

@@ -20,10 +20,11 @@ import '../../logger.dart';
 import '../websocket.dart';
 
 Future<LiveKitWebSocketIO> lkWebSocketConnect(
-  Uri uri, [
+  Uri uri, {
   WebSocketEventHandlers? options,
-]) =>
-    LiveKitWebSocketIO.connect(uri, options);
+  Map<String, String>? headers,
+}) =>
+    LiveKitWebSocketIO.connect(uri, options: options, headers: headers);
 
 class LiveKitWebSocketIO extends LiveKitWebSocket {
   final io.WebSocket _ws;
@@ -70,12 +71,13 @@ class LiveKitWebSocketIO extends LiveKitWebSocket {
   }
 
   static Future<LiveKitWebSocketIO> connect(
-    Uri uri, [
+    Uri uri, {
     WebSocketEventHandlers? options,
-  ]) async {
+    Map<String, String>? headers,
+  }) async {
     logger.fine('[WebSocketIO] Connecting(uri: ${uri.toString()})...');
     try {
-      final ws = await io.WebSocket.connect(uri.toString());
+      final ws = await io.WebSocket.connect(uri.toString(), headers: headers);
       logger.fine('[WebSocketIO] Connected');
       return LiveKitWebSocketIO._(ws, options);
     } catch (err) {

lib/src/support/websocket/web.dart

@@ -25,9 +25,10 @@ import '../websocket.dart';
 // ignore: avoid_web_libraries_in_flutter
 
 Future<LiveKitWebSocketWeb> lkWebSocketConnect(
-  Uri uri, [
+  Uri uri, {
   WebSocketEventHandlers? options,
-]) =>
+  Map<String, String>? headers, // |headers| will be ignored on web
+}) =>
     LiveKitWebSocketWeb.connect(uri, options);
 
 class LiveKitWebSocketWeb extends LiveKitWebSocket {
@@ -39,6 +40,7 @@ class LiveKitWebSocketWeb extends LiveKitWebSocket {
   LiveKitWebSocketWeb._(
     this._ws, [
     this.options,
+    Map<String, String>? headers,
   ]) {
     _ws.binaryType = 'arraybuffer';
     _messageSubscription = _ws.onMessage.listen((_) {