Provide participantIdentity instead of SID for permission APIs (#26)

livekit · Apr 9, 2023 · f192975 · f192975
1 parent 817e049
commit f192975
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/Runtime/Scripts/Room/Participant/ParticipantTrackPermission.cs b/Runtime/Scripts/Room/Participant/ParticipantTrackPermission.cs
@@ -4,8 +4,8 @@ namespace LiveKit
 {
     public struct ParticipantTrackPermission
     {
-        [JsonProperty("participantSid")]
-        public string ParticipantSid;
+        [JsonProperty("participantIdentity")]
+        public string ParticipantIdentity;
         [JsonProperty("allowAll")]
         public bool? AllowAll;
         [JsonProperty("allowedTrackSids")]

diff --git a/Runtime/Scripts/Room/Room.cs b/Runtime/Scripts/Room/Room.cs
@@ -47,7 +47,7 @@ public class Room : JSEventEmitter<RoomEvent>, IDisposable
         public delegate void TrackStreamStateChangedDelegate(RemoteTrackPublication publication, TrackStreamState streamState, RemoteParticipant participant);
         public delegate void TrackSubscriptionPermissionChangedDelegate(RemoteTrackPublication publication, SubscriptionStatus status, RemoteParticipant participant);
         public delegate void AudioPlaybackChangedDelegate(bool playing);
-        
+
         public event ReconnectingDelegate Reconnecting;
         public event ReconnectedDelegate Reconnected;
         public event DisconnectedDelegate Disconnected;
@@ -83,7 +83,7 @@ private static void EventReceived(IntPtr iptr)
             try
             {
                 var room = Acquire<Room>(JSNative.GetFunctionInstance());
-                
+
                 switch (evRef.Event)
                 {
                     case RoomEvent.Reconnecting:
@@ -100,7 +100,7 @@ private static void EventReceived(IntPtr iptr)
                         DisconnectReason? reason = null;
                         if(JSNative.IsNumber(pPtr))
                             reason = (DisconnectReason?) JSNative.GetNumber(pPtr);
-                        
+
                         Log.Debug($"Room: Received Disconnected({reason})");
                         room.Disconnected?.Invoke(reason);
                         break;
@@ -210,7 +210,7 @@ private static void EventReceived(IntPtr iptr)
                             string metadata = null;
                             if (JSNative.IsString(mdPtr))
                                 metadata = JSNative.GetString(mdPtr);
-                            
+
                             var participant = Acquire<Participant>(JSNative.ShiftStack());
                             Log.Debug($"Room: Received ParticipantMetadataChanged(\"{metadata}\", {participant.Sid})");
                             room.ParticipantMetadataChanged?.Invoke(metadata, participant);
@@ -243,7 +243,7 @@ private static void EventReceived(IntPtr iptr)
                             DataPacketKind? kind = null;
                             if (JSNative.IsNumber(kindPtr))
                                 kind = (DataPacketKind?) JSNative.GetNumber(kindPtr);
-                            
+
                             Log.Debug($"Room: Received DataReceived({data}, {participant?.Sid}, {kind})");
                             room.DataReceived?.Invoke(data.ToArray(), participant, kind);
                             break;
@@ -301,7 +301,7 @@ private static void EventReceived(IntPtr iptr)
                 Log.Error($"Error happened on RoomEvent.{evRef.Event} ( Is your listeners working correctly ? ): {Environment.NewLine} {e.Message}");
             }
         }
-                
+
         public bool IsClosed
         {
             get
@@ -310,7 +310,7 @@ public bool IsClosed
                 return JSNative.GetBoolean(JSNative.GetProperty(NativeHandle));
             }
         }
-        
+
         public ConnectionState State
         {
             get
@@ -340,7 +340,7 @@ public JSArray<Participant> ActiveSpeakers
 
         public string Sid
         {
-            get 
+            get
             {
                 JSNative.PushString("sid");
                 return JSNative.GetString(JSNative.GetProperty(NativeHandle));
@@ -428,26 +428,26 @@ public static JSPromise<JSArray<MediaDeviceInfo>> GetLocalDevices(MediaDeviceKin
                 JSNative.PushString(Utils.ToEnumString(kind.Value));
             else
                 JSNative.PushUndefined();
-            
+
             if(requestPermissions.HasValue)
                 JSNative.PushBoolean(requestPermissions.Value);
-            
+
             return Acquire<JSPromise<JSArray<MediaDeviceInfo>>>(JSNative.CallMethod(roomClazz, "getLocalDevices"));
         }
 
         private void RegisterEvents()
         {
             foreach (var e in Enum.GetValues(typeof(RoomEvent)))
                 SetListener((RoomEvent) e, EventReceived);
-    
+
             SetKeepAlive(LocalParticipant, true);
-            
+
             ParticipantConnected += (p) => SetKeepAlive(p, true);
             ParticipantDisconnected += (p) => SetKeepAlive(p, false);
-            
+
             LocalTrackPublished += (publication, participant) => SetKeepAlive(publication.Track, true);
             LocalTrackUnpublished += (publication, participant) => SetKeepAlive(publication.Track, false);
-            
+
             TrackSubscribed += (track, publication, participant) => SetKeepAlive(track, true);
             TrackUnsubscribed += (track, publication, participant) => SetKeepAlive(track, false);
         }
@@ -468,7 +468,7 @@ public void Dispose()
             Dispose(true);
             GC.SuppressFinalize(this);
         }
-        
+
         public void Disconnect(bool stopTracks = true)
         {
             JSNative.PushBoolean(stopTracks);
@@ -482,7 +482,7 @@ public Participant GetParticipantByIdentity(string identity)
             var ptr = JSNative.CallMethod(NativeHandle, "getParticipantByIdentity");
             if (!JSNative.IsObject(ptr))
                 return null;
-            
+
             return Acquire<Participant>(ptr);
         }