2nd half of changes

2 files changed, 27 insertions, 5 deletions

diff --git a/Jellyfin.Server.Implementations/JellyfinDb.cs b/Jellyfin.Server.Implementations/JellyfinDb.cs
index 7e13146902..35003c1ae3 100644
--- a/Jellyfin.Server.Implementations/JellyfinDb.cs
+++ b/Jellyfin.Server.Implementations/JellyfinDb.cs
@@ -16,10 +16,6 @@ namespace Jellyfin.Server.Implementations
     public partial class JellyfinDb : DbContext
     {
         public virtual DbSet<ActivityLog> ActivityLogs { get; set; }
-        public virtual DbSet<Group> Groups { get; set; }
-        public virtual DbSet<Permission> Permissions { get; set; }
-        public virtual DbSet<Preference> Preferences { get; set; }
-        public virtual DbSet<ProviderMapping> ProviderMappings { get; set; }
         public virtual DbSet<Data.Entities.User> Users { get; set; }
         /*public virtual DbSet<Artwork> Artwork { get; set; }
         public virtual DbSet<Book> Books { get; set; }
@@ -34,6 +30,7 @@ namespace Jellyfin.Server.Implementations
         public virtual DbSet<Episode> Episodes { get; set; }
         public virtual DbSet<EpisodeMetadata> EpisodeMetadata { get; set; }
         public virtual DbSet<Genre> Genres { get; set; }
+        public virtual DbSet<Group> Groups { get; set; }
         public virtual DbSet<Library> Libraries { get; set; }
         public virtual DbSet<LibraryItem> LibraryItems { get; set; }
         public virtual DbSet<LibraryRoot> LibraryRoot { get; set; }
@@ -46,10 +43,13 @@ namespace Jellyfin.Server.Implementations
         public virtual DbSet<MovieMetadata> MovieMetadata { get; set; }
         public virtual DbSet<MusicAlbum> MusicAlbums { get; set; }
         public virtual DbSet<MusicAlbumMetadata> MusicAlbumMetadata { get; set; }
+        public virtual DbSet<Permission> Permissions { get; set; }
         public virtual DbSet<Person> People { get; set; }
         public virtual DbSet<PersonRole> PersonRoles { get; set; }
         public virtual DbSet<Photo> Photo { get; set; }
         public virtual DbSet<PhotoMetadata> PhotoMetadata { get; set; }
+        public virtual DbSet<Preference> Preferences { get; set; }
+        public virtual DbSet<ProviderMapping> ProviderMappings { get; set; }
         public virtual DbSet<Rating> Ratings { get; set; }
 
         /// <summary>
@@ -63,7 +63,7 @@ namespace Jellyfin.Server.Implementations
         public virtual DbSet<Series> Series { get; set; }
         public virtual DbSet<SeriesMetadata> SeriesMetadata { get; set; }
         public virtual DbSet<Track> Tracks { get; set; }
-        public virtual DbSet<TrackMetadata> TrackMetadata { get; set; } */
+        public virtual DbSet<TrackMetadata> TrackMetadata { get; set; }*/
 
         /// <summary>
         /// Gets or sets the default connection string.
diff --git a/Jellyfin.Server.Implementations/User/UserManager.cs b/Jellyfin.Server.Implementations/User/UserManager.cs
index 1ed11cfcbb..73905ff70b 100644
--- a/Jellyfin.Server.Implementations/User/UserManager.cs
+++ b/Jellyfin.Server.Implementations/User/UserManager.cs
@@ -306,6 +306,28 @@ namespace Jellyfin.Server.Implementations.User
             };
         }
 
+        public PublicUserDto GetPublicUserDto(Data.Entities.User user, string remoteEndPoint = null)
+        {
+            if (user == null)
+            {
+                throw new ArgumentNullException(nameof(user));
+            }
+
+            bool hasConfiguredPassword = GetAuthenticationProvider(user).HasPassword(user);
+            bool hasConfiguredEasyPassword = !string.IsNullOrEmpty(GetAuthenticationProvider(user).GetEasyPasswordHash(user));
+
+            bool hasPassword = user.EnableLocalPassword &&
+                               !string.IsNullOrEmpty(remoteEndPoint) &&
+                               _networkManager.IsInLocalNetwork(remoteEndPoint) ? hasConfiguredEasyPassword : hasConfiguredPassword;
+
+            return new PublicUserDto
+            {
+                Name = user.Username,
+                HasPassword = hasPassword,
+                HasConfiguredPassword = hasConfiguredPassword
+            };
+        }
+
         public async Task<Data.Entities.User> AuthenticateUser(
             string username,
             string password,