migrated to v2 api

Author: Kevin Jensen

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

@@ -249,11 +249,9 @@ public async Task<AnnouncementContainer> Announcements() =>
         /// Returns a list of Home Users for Account
         /// </summary>
         /// <returns>UserContainer Object</returns>
-        public async Task<UserContainer> HomeUsers() =>
+        public async Task<HomeUserContainer> HomeUsers() =>
             await this.plexAccountClient.GetHomeUsersAsync(this.AuthToken);
 
-
-
         /// <summary>
         /// Returns a list of all User objects connected to your account.
         /// This includes both friends and pending invites. You can reference the user.Friend to
@@ -288,9 +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

@@ -94,7 +94,7 @@ public interface IPlexAccountClient
         /// </summary>
         /// <param name="authToken">Authentication Token.</param>
         /// <returns>List of Users</returns>
-        Task<UserContainer> GetHomeUsersAsync(string authToken);
+        Task<HomeUserContainer> GetHomeUsersAsync(string authToken);
 
         /// <summary>
         /// Opt in or out of sharing stuff with plex.

Source/Plex.ServerApi/Clients/PlexAccountClient.cs

@@ -189,22 +189,24 @@ public async Task<List<Friend>> GetFriendsAsync(string authToken)
             var apiRequest = new ApiRequestBuilder(BaseUri + "friends.json", string.Empty, HttpMethod.Get)
                 .AddPlexToken(authToken)
                 .AddRequestHeaders(ClientUtilities.GetClientIdentifierHeader(this.clientOptions.ClientId))
+                .AcceptJson()
                 .Build();
 
             var friends = await this.apiService.InvokeApiAsync<List<Friend>>(apiRequest);
             return friends;
         }
 
         /// <inheritdoc/>
-        public async Task<UserContainer> GetHomeUsersAsync(string authToken)
+        public async Task<HomeUserContainer> GetHomeUsersAsync(string authToken)
         {
-            var apiRequest = new ApiRequestBuilder("https://plex.tv/home/users", string.Empty, HttpMethod.Get)
+            var apiRequest = new ApiRequestBuilder(BaseUri + "home/users", string.Empty, HttpMethod.Get)
                 .AddPlexToken(authToken)
                 .AddRequestHeaders(ClientUtilities.GetClientIdentifierHeader(this.clientOptions.ClientId))
                 .AddRequestHeaders(ClientUtilities.GetClientMetaHeaders(this.clientOptions))
+                .AcceptJson()
                 .Build();
 
-            var container = await this.apiService.InvokeApiAsync<UserContainer>(apiRequest);
+            var container = await this.apiService.InvokeApiAsync<HomeUserContainer>(apiRequest);
             return container;
         }
 

Source/Plex.ServerApi/PlexModels/Account/User/HomeUser.cs

@@ -0,0 +1,80 @@
+namespace Plex.ServerApi.PlexModels.Account.User;
+
+using System.Text.Json.Serialization;
+
+public class HomeUser
+{
+    /// <summary>
+    /// User's Plex account ID.
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// User's Plex account UUID.
+    /// </summary>
+    public string Uuid { get; set; }
+
+    /// <summary>
+    /// Seems to be an alias for username.
+    /// </summary>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// User's username.
+    /// </summary>
+    public string Username { get; set; }
+
+    /// <summary>
+    /// User's email address (user@gmail.com).
+    /// </summary>
+    public string Email { get; set; }
+
+    /// <summary>
+    /// ???
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Link to the users avatar.
+    /// </summary>
+    public string Thumb { get; set; }
+
+    /// <summary>
+    /// Does the user have a password
+    /// </summary>
+    public bool HasPassword { get; set; }
+
+    /// <summary>
+    /// Date user was last updated
+    /// </summary>
+    public long UpdatedAt { get; set; }
+
+    /// <summary>
+    /// Is User Account Admin.
+    /// </summary>
+    [JsonPropertyName("admin")]
+    public bool IsAdmin { get; set; }
+
+    /// <summary>
+    /// Is User Account Guest.
+    /// </summary>
+    [JsonPropertyName("guest")]
+    public bool IsGuest { get; set; }
+
+    /// <summary>
+    /// Is User Account Restricted.
+    /// </summary>
+    [JsonPropertyName("restricted")]
+    public bool IsRestricted { get; set; }
+
+    /// <summary>
+    /// Profile if user is restricted
+    /// </summary>
+    public string RestrictionProfile { get; set; }
+
+    /// <summary>
+    /// Unknown (possibly SSL enabled?).
+    /// </summary>
+    [JsonPropertyName("protected")]
+    public bool IsProtected { get; set; }
+}

Source/Plex.ServerApi/PlexModels/Account/User/User.cs

@@ -1,30 +1,21 @@
-namespace Plex.ServerApi.PlexModels.Account.User
-{
-    using System.Collections.Generic;
-    using System.Xml.Serialization;
-
-    [XmlRoot(ElementName="MediaContainer")]
-    public class UserContainer
-    {
-        [XmlElement(ElementName="User")]
-        public List<User> User { get; set; }
+namespace Plex.ServerApi.PlexModels.Account.User;
 
-        [XmlAttribute(AttributeName="friendlyName")]
-        public string FriendlyName { get; set; }
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
-        [XmlAttribute(AttributeName="identifier")]
-        public string Identifier { get; set; }
+public class HomeUserContainer
+{
+    public int Id { get; set; }
+    public string Name { get; set; }
 
-        [XmlAttribute(AttributeName="machineIdentifier")]
-        public string MachineIdentifier { get; set; }
+    [JsonPropertyName(("guestUserID"))]
+    public int GuestUserId { get; set; }
 
-        [XmlAttribute(AttributeName="totalSize")]
-        public int TotalSize { get; set; }
+    [JsonPropertyName(("guestUserUUID"))]
+    public string GuestUserUuid { get; set; }
 
-        [XmlAttribute(AttributeName="size")]
-        public int Size { get; set; }
+    public bool GuestEnabled { get; set; }
+    public bool Subscription { get; set; }
 
-        [XmlAttribute(AttributeName="guestUserID")]
-        public int GuestUserId { get; set; }
-    }
+    public List<HomeUser> Users { get; set; }
 }

Source/Plex.ServerApi/PlexModels/Account/User/UserContainer.cs

@@ -24,6 +24,22 @@ public AccountTest(ITestOutputHelper output, PlexFixture fixture)
             this.plexAccountClient = fixture.ServiceProvider.GetService<IPlexAccountClient>();
         }
 
+        [Fact]
+        public async void Test_GetAccountFriends()
+        {
+            var friends = await this.plexAccountClient.GetFriendsAsync(this.config.AuthenticationKey);
+
+            Assert.NotEmpty(friends);
+        }
+
+        [Fact]
+        public async void Test_GetHomeUsers()
+        {
+            var homeUserContainer = await this.plexAccountClient.GetHomeUsersAsync(this.config.AuthenticationKey);
+
+            Assert.NotNull(homeUserContainer);
+        }
+
         [Fact]
         public async void Test_GetWatchlist()
         {