Explorar o código

Prefer ApiKey over api_key in generated URL's (#13342)

Niels van Velzen hai 4 meses
pai
achega
3b8e614819

+ 1 - 1
Jellyfin.Api/Controllers/SubtitleController.cs

@@ -395,7 +395,7 @@ public class SubtitleController : BaseJellyfinApiController
 
             var url = string.Format(
                 CultureInfo.InvariantCulture,
-                "stream.vtt?CopyTimestamps=true&AddVttTimeMap=true&StartPositionTicks={0}&EndPositionTicks={1}&api_key={2}",
+                "stream.vtt?CopyTimestamps=true&AddVttTimeMap=true&StartPositionTicks={0}&EndPositionTicks={1}&ApiKey={2}",
                 positionTicks.ToString(CultureInfo.InvariantCulture),
                 endPositionTicks.ToString(CultureInfo.InvariantCulture),
                 accessToken);

+ 2 - 2
Jellyfin.Api/Helpers/DynamicHlsHelper.cs

@@ -550,7 +550,7 @@ public class DynamicHlsHelper
 
             var url = string.Format(
                 CultureInfo.InvariantCulture,
-                "{0}/Subtitles/{1}/subtitles.m3u8?SegmentLength={2}&api_key={3}",
+                "{0}/Subtitles/{1}/subtitles.m3u8?SegmentLength={2}&ApiKey={3}",
                 state.Request.MediaSourceId,
                 stream.Index.ToString(CultureInfo.InvariantCulture),
                 30.ToString(CultureInfo.InvariantCulture),
@@ -587,7 +587,7 @@ public class DynamicHlsHelper
 
             var url = string.Format(
                 CultureInfo.InvariantCulture,
-                "Trickplay/{0}/tiles.m3u8?MediaSourceId={1}&api_key={2}",
+                "Trickplay/{0}/tiles.m3u8?MediaSourceId={1}&ApiKey={2}",
                 width.ToString(CultureInfo.InvariantCulture),
                 state.Request.MediaSourceId,
                 user.GetToken());

+ 1 - 1
Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs

@@ -536,7 +536,7 @@ public class TrickplayManager : ITrickplayManager
 
             if (trickplayInfo.ThumbnailCount > 0)
             {
-                const string urlFormat = "{0}.jpg?MediaSourceId={1}&api_key={2}";
+                const string urlFormat = "{0}.jpg?MediaSourceId={1}&ApiKey={2}";
                 const string decimalFormat = "{0:0.###}";
 
                 var resolution = $"{trickplayInfo.Width}x{trickplayInfo.Height}";

+ 2 - 2
MediaBrowser.Model/Dlna/StreamInfo.cs

@@ -979,7 +979,7 @@ public class StreamInfo
         }
 
         list.Add(new NameValuePair("PlaySessionId", item.PlaySessionId ?? string.Empty));
-        list.Add(new NameValuePair("api_key", accessToken ?? string.Empty));
+        list.Add(new NameValuePair("ApiKey", accessToken ?? string.Empty));
 
         string? liveStreamId = item.MediaSource?.LiveStreamId;
         list.Add(new NameValuePair("LiveStreamId", liveStreamId ?? string.Empty));
@@ -1189,7 +1189,7 @@ public class StreamInfo
 
                 if (!string.IsNullOrEmpty(accessToken))
                 {
-                    info.Url += "?api_key=" + accessToken;
+                    info.Url += "?ApiKey=" + accessToken;
                 }
 
                 info.IsExternalUrl = false;