uri cleanup

Author: Kevin Jensen

Source/Plex.Library/ApiModels/Accounts/PlexAccount.cs

@@ -188,7 +188,7 @@ public async Task<List<Server>> Servers()
         /// Return list of Resources for Plex Account
         /// </summary>
         /// <returns>List of Resource Objects</returns>
-        public async Task<ResourceContainer> Resources() =>
+        public async Task<List<Resource>> Resources() =>
             await this.plexAccountClient.GetResourcesAsync(this.AuthToken);
 
         /// <summary>
@@ -286,7 +286,7 @@ public async Task OptOut(bool playback, bool library) =>
         /// <returns>List of Device objects</returns>
         public async Task<List<Device>> Devices() =>
             await this.plexAccountClient.GetDevicesAsync(this.AuthToken);
-        
+
         // AddWebhook(string url);
         // DeleteWebhook(string url);
         // SetWebhooks(string[] urls);

Source/Plex.ServerApi/Clients/Interfaces/IPlexAccountClient.cs

@@ -63,7 +63,7 @@ public interface IPlexAccountClient
         /// </summary>
         /// <param name="authToken">Authentication Token.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task<ResourceContainer> GetResourcesAsync(string authToken);
+        Task<List<Resource>> GetResourcesAsync(string authToken);
 
         /// <summary>
         /// http://[PMS_IP_Address]:32400/library/sections?X-Plex-Token=YourTokenGoesHere

Source/Plex.ServerApi/Clients/PlexAccountClient.cs

@@ -1,87 +1,42 @@
-namespace Plex.ServerApi.PlexModels.Account.Resources
+namespace Plex.ServerApi.PlexModels.Account.Resources;
+
+using System.Collections.Generic;
+using System.Xml.Serialization;
+
+/// <summary>
+/// This object represents resources connected to your Plex server that can provide
+/// content such as Plex Media Servers, iPhone or Android clients, etc. The raw xml
+/// for the data presented here can be found at:
+/// https://plex.tv/api/resources?includeHttps=1&includeRelay=1
+/// </summary>
+public class Resource
 {
-    using System.Collections.Generic;
-    using System.Xml.Serialization;
+    public string Name { get; set; }
+    public string Product { get; set; }
+    public string ProductVersion { get; set; }
+    public string Platform { get; set; }
+    public string PlatformVersion { get; set; }
+    public string Device { get; set; }
+    public string ClientIdentifier { get; set; }
+    public string CreatedAt { get; set; }
+    public string LastSeenAt { get; set; }
+    public string Provides { get; set; }
+    public int? OwnerId { get; set; }
+    public string SourceTitle { get; set; }
+    public string PublicAddress { get; set; }
+    public string AccessToken { get; set; }
+    public bool Owned { get; set; }
+    public bool Home { get; set; }
+    public bool Synced { get; set; }
+    public bool Relay { get; set; }
+    public bool Presence { get; set; }
+    public bool HttpsRequired { get; set; }
+    public bool PublicAddressMatches { get; set; }
+    public bool DnsRebindingProtection { get; set; }
+    public bool NatLoopbackSupport { get; set; }
 
     /// <summary>
-    /// This object represents resources connected to your Plex server that can provide
-    /// content such as Plex Media Servers, iPhone or Android clients, etc. The raw xml
-    /// for the data presented here can be found at:
-    /// https://plex.tv/api/resources?includeHttps=1&includeRelay=1
+    /// Connections
     /// </summary>
-    [XmlRoot(ElementName = "Device")]
-    public class Resource
-    {
-        [XmlElement(ElementName = "Connection")]
-        public List<ResourceConnection> Connections { get; set; }
-
-        [XmlAttribute(AttributeName = "name")]
-        public string Name { get; set; }
-
-        [XmlAttribute(AttributeName = "product")]
-        public string Product { get; set; }
-
-        [XmlAttribute(AttributeName = "productVersion")]
-        public string ProductVersion { get; set; }
-
-        [XmlAttribute(AttributeName = "platform")]
-        public string Platform { get; set; }
-
-        [XmlAttribute(AttributeName = "platformVersion")]
-        public string PlatformVersion { get; set; }
-
-        [XmlAttribute(AttributeName = "device")]
-        public string Device { get; set; }
-
-        [XmlAttribute(AttributeName = "clientIdentifier")]
-        public string ClientIdentifier { get; set; }
-
-        [XmlAttribute(AttributeName = "createdAt")]
-        public int CreatedAt { get; set; }
-
-        [XmlAttribute(AttributeName = "lastSeenAt")]
-        public int LastSeenAt { get; set; }
-
-        [XmlAttribute(AttributeName = "provides")]
-        public string Provides { get; set; }
-
-        [XmlAttribute(AttributeName = "owned")]
-        public int Owned { get; set; }
-
-        [XmlAttribute(AttributeName = "accessToken")]
-        public string AccessToken { get; set; }
-
-        [XmlAttribute(AttributeName = "publicAddress")]
-        public string PublicAddress { get; set; }
-
-        [XmlAttribute(AttributeName = "httpsRequired")]
-        public int HttpsRequired { get; set; }
-
-        [XmlAttribute(AttributeName = "synced")]
-        public int Synced { get; set; }
-
-        [XmlAttribute(AttributeName = "relay")]
-        public int Relay { get; set; }
-
-        [XmlAttribute(AttributeName = "dnsRebindingProtection")]
-        public int DnsRebindingProtection { get; set; }
-
-        [XmlAttribute(AttributeName = "natLoopbackSupported")]
-        public int NatLoopbackSupported { get; set; }
-
-        [XmlAttribute(AttributeName = "publicAddressMatches")]
-        public int PublicAddressMatches { get; set; }
-
-        [XmlAttribute(AttributeName = "presence")]
-        public int Presence { get; set; }
-
-        [XmlAttribute(AttributeName = "ownerId")]
-        public int OwnerId { get; set; }
-
-        [XmlAttribute(AttributeName = "home")]
-        public int Home { get; set; }
-
-        [XmlAttribute(AttributeName = "sourceTitle")]
-        public string SourceTitle { get; set; }
-    }
+    public List<ResourceConnection> Connections { get; set; }
 }

Source/Plex.ServerApi/PlexModels/Account/Resources/Resource.cs

@@ -1,23 +1,15 @@
-namespace Plex.ServerApi.PlexModels.Account.Resources
-{
-    using System.Xml.Serialization;
+namespace Plex.ServerApi.PlexModels.Account.Resources;
 
-    [XmlRoot(ElementName="Connection")]
-    public class ResourceConnection {
+using System.Text.Json.Serialization;
 
-        [XmlAttribute(AttributeName="protocol")]
-        public string Protocol { get; set; }
+public class ResourceConnection {
 
-        [XmlAttribute(AttributeName="address")]
-        public string Address { get; set; }
-
-        [XmlAttribute(AttributeName="port")]
-        public int Port { get; set; }
-
-        [XmlAttribute(AttributeName="uri")]
-        public string Uri { get; set; }
-
-        [XmlAttribute(AttributeName="local")]
-        public int Local { get; set; }
-    }
+    public string Protocol { get; set; }
+    public string Address { get; set; }
+    public int Port { get; set; }
+    public string Uri { get; set; }
+    public bool Local { get; set; }
+    public bool Relay { get; set; }
+    [JsonPropertyName("IPv6")]
+    public bool IpV6 { get; set; }
 }

Source/Plex.ServerApi/PlexModels/Account/Resources/ResourceConnection.cs

@@ -40,6 +40,14 @@ public async void Test_GetHomeUsers()
             Assert.NotNull(homeUserContainer);
         }
 
+        [Fact]
+        public async void Test_GetAccountResources()
+        {
+            var resources = await this.plexAccountClient.GetResourcesAsync(this.config.AuthenticationKey);
+
+            Assert.NotNull(resources);
+        }
+
         [Fact]
         public async void Test_GetWatchlist()
         {

Source/Plex.ServerApi/PlexModels/Account/Resources/ResourceContainer.cs

@@ -125,18 +125,18 @@ await this.plexLibraryClient.CreatePlayQueue(this.config.AuthenticationKey,
             Assert.True(playQueueContainer.Size > 0);
 
             // 1. Get All Active Resources tied to Plex Account
-            var resourceContainer = await this.plexAccountClient.GetResourcesAsync(this.config.AuthenticationKey);
+            var resources = await this.plexAccountClient.GetResourcesAsync(this.config.AuthenticationKey);
 
             // 2. Get Server we want to use
-            var plexServer = resourceContainer.Resources
-                .First(c => c.Name == "Plex Media Server" && c.Provides.Contains("server"));
+            var plexServer = resources.
+                First(c => c.Name == "Plex Media Server" && c.Provides.Contains("server"));
 
             // 3. Get Transient Token from Server
             var token = await this.plexServerClient.GetTransientToken(this.config.AuthenticationKey,
                 this.config.Host);
 
             // 4. Get List of players that support 'player'.
-            var players = resourceContainer.Resources
+            var players = resources
                 .Where(c => c.Provides.Contains("player"));
 
             // 5. Get Player by name

Tests/Plex.Library.Test/Tests/AccountTest.cs

@@ -157,8 +157,8 @@ public async void Test_GetPlexAccountWatchlist_ShowsOnly()
         [Fact]
         public async void Test_Get_Resources()
         {
-            var resourceContainer = await this.fixture.PlexAccount.Resources();
-             foreach (var resource in resourceContainer.Resources)
+            var resources = await this.fixture.PlexAccount.Resources();
+             foreach (var resource in resources)
              {
                  var name = string.IsNullOrEmpty(resource.Name) ? "Unkown" : resource.Name;
                  if (resource.Connections.Any())
@@ -171,7 +171,7 @@ public async void Test_Get_Resources()
                      this.output.WriteLine("No Connections");
                  }
             }
-            Assert.NotNull(resourceContainer);
+            Assert.NotNull(resources);
         }
 
         [Fact]