Merge pull request #23 from jellyfin/master

updating

38 files changed, 262 insertions, 142 deletions

diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 2cd68ac1b..a91a9b580 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -94,8 +95,8 @@ namespace MediaBrowser.Api
             var authenticatedUser = auth.User;
 
             // If they're going to update the record of another user, they must be an administrator
-            if ((!userId.Equals(auth.UserId) && !authenticatedUser.Policy.IsAdministrator)
-                || (restrictUserPreferences && !authenticatedUser.Policy.EnableUserPreferenceAccess))
+            if ((!userId.Equals(auth.UserId) && !authenticatedUser.HasPermission(PermissionKind.IsAdministrator))
+                || (restrictUserPreferences && !authenticatedUser.EnableUserPreferenceAccess))
             {
                 throw new SecurityException("Unauthorized access.");
             }
@@ -267,7 +268,6 @@ namespace MediaBrowser.Api
                 Name = name.Replace(BaseItem.SlugChar, '&'),
                 IncludeItemTypes = new[] { typeof(T).Name },
                 DtoOptions = dtoOptions
-
             }).OfType<T>().FirstOrDefault();
 
             result ??= libraryManager.GetItemList(new InternalItemsQuery
@@ -275,7 +275,6 @@ namespace MediaBrowser.Api
                 Name = name.Replace(BaseItem.SlugChar, '/'),
                 IncludeItemTypes = new[] { typeof(T).Name },
                 DtoOptions = dtoOptions
-
             }).OfType<T>().FirstOrDefault();
 
             result ??= libraryManager.GetItemList(new InternalItemsQuery
@@ -283,7 +282,6 @@ namespace MediaBrowser.Api
                 Name = name.Replace(BaseItem.SlugChar, '?'),
                 IncludeItemTypes = new[] { typeof(T).Name },
                 DtoOptions = dtoOptions
-
             }).OfType<T>().FirstOrDefault();
 
             return result;
diff --git a/MediaBrowser.Api/ChannelService.cs b/MediaBrowser.Api/ChannelService.cs
index fd9b8c396..3cab9fb66 100644
--- a/MediaBrowser.Api/ChannelService.cs
+++ b/MediaBrowser.Api/ChannelService.cs
@@ -240,7 +240,6 @@ namespace MediaBrowser.Api
                 {
                     Fields = request.GetItemFields()
                 }
-
             };
 
             foreach (var filter in request.GetFilters())
diff --git a/MediaBrowser.Api/ConfigurationService.cs b/MediaBrowser.Api/ConfigurationService.cs
index 316be04a0..3ad51de8d 100644
--- a/MediaBrowser.Api/ConfigurationService.cs
+++ b/MediaBrowser.Api/ConfigurationService.cs
@@ -17,7 +17,6 @@ namespace MediaBrowser.Api
     [Authenticated]
     public class GetConfiguration : IReturn<ServerConfiguration>
     {
-
     }
 
     [Route("/System/Configuration/{Key}", "GET", Summary = "Gets a named configuration")]
@@ -51,7 +50,6 @@ namespace MediaBrowser.Api
     [Authenticated(Roles = "Admin")]
     public class GetDefaultMetadataOptions : IReturn<MetadataOptions>
     {
-
     }
 
     [Route("/System/MediaEncoder/Path", "POST", Summary = "Updates the path to the media encoder")]
diff --git a/MediaBrowser.Api/Devices/DeviceService.cs b/MediaBrowser.Api/Devices/DeviceService.cs
index dd3f3e738..18860983e 100644
--- a/MediaBrowser.Api/Devices/DeviceService.cs
+++ b/MediaBrowser.Api/Devices/DeviceService.cs
@@ -92,7 +92,6 @@ namespace MediaBrowser.Api.Devices
             var sessions = _authRepo.Get(new AuthenticationInfoQuery
             {
                 DeviceId = request.Id
-
             }).Items;
 
             foreach (var session in sessions)
diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs
index 82d471412..fddf78465 100644
--- a/MediaBrowser.Api/EnvironmentService.cs
+++ b/MediaBrowser.Api/EnvironmentService.cs
@@ -100,7 +100,6 @@ namespace MediaBrowser.Api
     [Route("/Environment/DefaultDirectoryBrowser", "GET", Summary = "Gets the parent path of a given path")]
     public class GetDefaultDirectoryBrowser : IReturn<DefaultDirectoryBrowserInfo>
     {
-
     }
 
     /// <summary>
diff --git a/MediaBrowser.Api/FilterService.cs b/MediaBrowser.Api/FilterService.cs
index 5eb72cdb1..833a684a5 100644
--- a/MediaBrowser.Api/FilterService.cs
+++ b/MediaBrowser.Api/FilterService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -149,7 +150,6 @@ namespace MediaBrowser.Api
                 {
                     Name = i.Item1.Name,
                     Id = i.Item1.Id
-
                 }).ToArray();
             }
             else
@@ -158,7 +158,6 @@ namespace MediaBrowser.Api
                 {
                     Name = i.Item1.Name,
                     Id = i.Item1.Id
-
                 }).ToArray();
             }
 
diff --git a/MediaBrowser.Api/IHasItemFields.cs b/MediaBrowser.Api/IHasItemFields.cs
index 85b4a7e2d..6359de77d 100644
--- a/MediaBrowser.Api/IHasItemFields.cs
+++ b/MediaBrowser.Api/IHasItemFields.cs
@@ -43,7 +43,6 @@ namespace MediaBrowser.Api
                 }
 
                 return null;
-
             }).Where(i => i.HasValue).Select(i => i.Value).ToArray();
         }
     }
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index fdb15d96a..6f2956c5d 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -18,9 +18,11 @@ using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
+using User = Jellyfin.Data.Entities.User;
 
 namespace MediaBrowser.Api.Images
 {
@@ -408,14 +410,14 @@ namespace MediaBrowser.Api.Images
         {
             var item = _userManager.GetUserById(request.Id);
 
-            return GetImage(request, Guid.Empty, item, false);
+            return GetImage(request, item, false);
         }
 
         public object Head(GetUserImage request)
         {
             var item = _userManager.GetUserById(request.Id);
 
-            return GetImage(request, Guid.Empty, item, true);
+            return GetImage(request, item, true);
         }
 
         public object Get(GetItemByNameImage request)
@@ -448,9 +450,9 @@ namespace MediaBrowser.Api.Images
 
             request.Type = Enum.Parse<ImageType>(GetPathValue(3).ToString(), true);
 
-            var item = _userManager.GetUserById(id);
+            var user = _userManager.GetUserById(id);
 
-            return PostImage(item, request.RequestStream, request.Type, Request.ContentType);
+            return PostImage(user, request.RequestStream, Request.ContentType);
         }
 
         /// <summary>
@@ -477,9 +479,17 @@ namespace MediaBrowser.Api.Images
             var userId = request.Id;
             AssertCanUpdateUser(_authContext, _userManager, userId, true);
 
-            var item = _userManager.GetUserById(userId);
+            var user = _userManager.GetUserById(userId);
+            try
+            {
+                File.Delete(user.ProfileImage.Path);
+            }
+            catch (IOException e)
+            {
+                Logger.LogError(e, "Error deleting user profile image:");
+            }
 
-            item.DeleteImage(request.Type, request.Index ?? 0);
+            _userManager.ClearProfileImage(user);
         }
 
         /// <summary>
@@ -567,14 +577,14 @@ namespace MediaBrowser.Api.Images
                 throw new ResourceNotFoundException(string.Format("{0} does not have an image of type {1}", item.Name, request.Type));
             }
 
-            bool cropwhitespace;
+            bool cropWhitespace;
             if (request.CropWhitespace.HasValue)
             {
-                cropwhitespace = request.CropWhitespace.Value;
+                cropWhitespace = request.CropWhitespace.Value;
             }
             else
             {
-                cropwhitespace = request.Type == ImageType.Logo || request.Type == ImageType.Art;
+                cropWhitespace = request.Type == ImageType.Logo || request.Type == ImageType.Art;
             }
 
             var outputFormats = GetOutputFormats(request);
@@ -597,7 +607,35 @@ namespace MediaBrowser.Api.Images
                 itemId,
                 request,
                 imageInfo,
-                cropwhitespace,
+                cropWhitespace,
+                outputFormats,
+                cacheDuration,
+                responseHeaders,
+                isHeadRequest);
+        }
+
+        public Task<object> GetImage(ImageRequest request, User user, bool isHeadRequest)
+        {
+            var imageInfo = GetImageInfo(request, user);
+
+            TimeSpan? cacheDuration = null;
+
+            if (!string.IsNullOrEmpty(request.Tag))
+            {
+                cacheDuration = TimeSpan.FromDays(365);
+            }
+
+            var responseHeaders = new Dictionary<string, string>
+            {
+                {"transferMode.dlna.org", "Interactive"},
+                {"realTimeInfo.dlna.org", "DLNA.ORG_TLAG=*"}
+            };
+
+            var outputFormats = GetOutputFormats(request);
+
+            return GetImageResult(user.Id,
+                request,
+                imageInfo,
                 outputFormats,
                 cacheDuration,
                 responseHeaders,
@@ -605,6 +643,55 @@ namespace MediaBrowser.Api.Images
         }
 
         private async Task<object> GetImageResult(
+            Guid itemId,
+            ImageRequest request,
+            ItemImageInfo info,
+            IReadOnlyCollection<ImageFormat> supportedFormats,
+            TimeSpan? cacheDuration,
+            IDictionary<string, string> headers,
+            bool isHeadRequest)
+        {
+            info.Type = ImageType.Profile;
+            var options = new ImageProcessingOptions
+            {
+                CropWhiteSpace = true,
+                Height = request.Height,
+                ImageIndex = request.Index ?? 0,
+                Image = info,
+                Item = null, // Hack alert
+                ItemId = itemId,
+                MaxHeight = request.MaxHeight,
+                MaxWidth = request.MaxWidth,
+                Quality = request.Quality ?? 100,
+                Width = request.Width,
+                AddPlayedIndicator = request.AddPlayedIndicator,
+                PercentPlayed = 0,
+                UnplayedCount = request.UnplayedCount,
+                Blur = request.Blur,
+                BackgroundColor = request.BackgroundColor,
+                ForegroundLayer = request.ForegroundLayer,
+                SupportedOutputFormats = supportedFormats
+            };
+
+            var imageResult = await _imageProcessor.ProcessImage(options).ConfigureAwait(false);
+
+            headers[HeaderNames.Vary] = HeaderNames.Accept;
+
+            return await ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions
+            {
+                CacheDuration = cacheDuration,
+                ResponseHeaders = headers,
+                ContentType = imageResult.Item2,
+                DateLastModified = imageResult.Item3,
+                IsHeadRequest = isHeadRequest,
+                Path = imageResult.Item1,
+
+                FileShare = FileShare.Read
+
+            }).ConfigureAwait(false);
+        }
+
+        private async Task<object> GetImageResult(
             BaseItem item,
             Guid itemId,
             ImageRequest request,
@@ -656,7 +743,6 @@ namespace MediaBrowser.Api.Images
                 Path = imageResult.Item1,
 
                 FileShare = FileShare.Read
-
             }).ConfigureAwait(false);
         }
 
@@ -741,13 +827,35 @@ namespace MediaBrowser.Api.Images
         /// <param name="request">The request.</param>
         /// <param name="item">The item.</param>
         /// <returns>System.String.</returns>
-        private ItemImageInfo GetImageInfo(ImageRequest request, BaseItem item)
+        private static ItemImageInfo GetImageInfo(ImageRequest request, BaseItem item)
         {
             var index = request.Index ?? 0;
 
             return item.GetImageInfo(request.Type, index);
         }
 
+        private static ItemImageInfo GetImageInfo(ImageRequest request, User user)
+        {
+            var info = new ItemImageInfo
+            {
+                Path = user.ProfileImage.Path,
+                Type = ImageType.Primary,
+                DateModified = user.ProfileImage.LastModified,
+            };
+
+            if (request.Width.HasValue)
+            {
+                info.Width = request.Width.Value;
+            }
+
+            if (request.Height.HasValue)
+            {
+                info.Height = request.Height.Value;
+            }
+
+            return info;
+        }
+
         /// <summary>
         /// Posts the image.
         /// </summary>
@@ -758,22 +866,41 @@ namespace MediaBrowser.Api.Images
         /// <returns>Task.</returns>
         public async Task PostImage(BaseItem entity, Stream inputStream, ImageType imageType, string mimeType)
         {
+            var memoryStream = await GetMemoryStream(inputStream);
+
+            // Handle image/png; charset=utf-8
+            mimeType = mimeType.Split(';').FirstOrDefault();
+
+            await _providerManager.SaveImage(entity, memoryStream, mimeType, imageType, null, CancellationToken.None).ConfigureAwait(false);
+
+            entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
+        }
+
+        private static async Task<MemoryStream> GetMemoryStream(Stream inputStream)
+        {
             using var reader = new StreamReader(inputStream);
             var text = await reader.ReadToEndAsync().ConfigureAwait(false);
 
             var bytes = Convert.FromBase64String(text);
-
-            var memoryStream = new MemoryStream(bytes)
+            return new MemoryStream(bytes)
             {
                 Position = 0
             };
+        }
+
+        private async Task PostImage(User user, Stream inputStream, string mimeType)
+        {
+            var memoryStream = await GetMemoryStream(inputStream);
 
             // Handle image/png; charset=utf-8
             mimeType = mimeType.Split(';').FirstOrDefault();
+            var userDataPath = Path.Combine(ServerConfigurationManager.ApplicationPaths.UserConfigurationDirectoryPath, user.Username);
+            user.ProfileImage = new Jellyfin.Data.Entities.ImageInfo(Path.Combine(userDataPath, "profile" + MimeTypes.ToExtension(mimeType)));
 
-            await _providerManager.SaveImage(entity, memoryStream, mimeType, imageType, null, CancellationToken.None).ConfigureAwait(false);
-
-            entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
+            await _providerManager
+                .SaveImage(user, memoryStream, mimeType, user.ProfileImage.Path)
+                .ConfigureAwait(false);
+            await _userManager.UpdateUserAsync(user);
         }
     }
 }
diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index 358ac30fa..2633a5d3c 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -152,7 +152,6 @@ namespace MediaBrowser.Api.Images
                 IncludeAllLanguages = request.IncludeAllLanguages,
                 IncludeDisabledProviders = true,
                 ImageType = request.Type
-
             }, CancellationToken.None).ConfigureAwait(false);
 
             var imagesList = images.ToArray();
diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index 68e3dfa59..862411209 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -220,7 +220,7 @@ namespace MediaBrowser.Api
         {
             var item = _libraryManager.GetItemById(new Guid(request.Id));
 
-            //foreach (var key in request.ProviderIds)
+            // foreach (var key in request.ProviderIds)
             //{
             //    var value = key.Value;
 
@@ -233,8 +233,8 @@ namespace MediaBrowser.Api
 
             // Since the refresh process won't erase provider Ids, we need to set this explicitly now.
             item.ProviderIds = request.ProviderIds;
-            //item.ProductionYear = request.ProductionYear;
-            //item.Name = request.Name;
+            // item.ProductionYear = request.ProductionYear;
+            // item.Name = request.Name;
 
             return _providerManager.RefreshFullItem(
                 item,
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 9d53a2610..eb64abb4d 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -6,6 +6,7 @@ using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Api.Movies;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
@@ -14,7 +15,6 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
@@ -27,6 +27,12 @@ using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
+using Book = MediaBrowser.Controller.Entities.Book;
+using Episode = MediaBrowser.Controller.Entities.TV.Episode;
+using MetadataProvider = MediaBrowser.Model.Entities.MetadataProvider;
+using Movie = MediaBrowser.Controller.Entities.Movies.Movie;
+using MusicAlbum = MediaBrowser.Controller.Entities.Audio.MusicAlbum;
+using Series = MediaBrowser.Controller.Entities.TV.Series;
 
 namespace MediaBrowser.Api.Library
 {
@@ -350,6 +356,7 @@ namespace MediaBrowser.Api.Library
             _moviesServiceLogger = moviesServiceLogger;
         }
 
+        // Content Types available for each Library
         private string[] GetRepresentativeItemTypes(string contentType)
         {
             return contentType switch
@@ -359,7 +366,7 @@ namespace MediaBrowser.Api.Library
                 CollectionType.Movies => new[] {"Movie"},
                 CollectionType.TvShows => new[] {"Series", "Season", "Episode"},
                 CollectionType.Books => new[] {"Book"},
-                CollectionType.Music => new[] {"MusicAlbum", "MusicArtist", "Audio", "MusicVideo"},
+                CollectionType.Music => new[] {"MusicArtist", "MusicAlbum", "Audio", "MusicVideo"},
                 CollectionType.HomeVideos => new[] {"Video", "Photo"},
                 CollectionType.Photos => new[] {"Video", "Photo"},
                 CollectionType.MusicVideos => new[] {"MusicVideo"},
@@ -425,7 +432,6 @@ namespace MediaBrowser.Api.Library
                 return string.Equals(name, "TheTVDB", StringComparison.OrdinalIgnoreCase)
                        || string.Equals(name, "Screen Grabber", StringComparison.OrdinalIgnoreCase)
                        || string.Equals(name, "TheAudioDB", StringComparison.OrdinalIgnoreCase)
-                       || string.Equals(name, "Emby Designs", StringComparison.OrdinalIgnoreCase)
                        || string.Equals(name, "Image Extractor", StringComparison.OrdinalIgnoreCase);
             }
 
@@ -556,7 +562,6 @@ namespace MediaBrowser.Api.Library
                     _authContext)
                 {
                     Request = Request,
-
                 }.GetSimilarItemsResult(request);
             }
 
@@ -654,7 +659,6 @@ namespace MediaBrowser.Api.Library
                 {
                     EnableImages = false
                 }
-
             }).Where(i => string.Equals(request.TvdbId, i.GetProviderId(MetadataProvider.Tvdb), StringComparison.OrdinalIgnoreCase)).ToArray();
 
             foreach (var item in series)
@@ -683,7 +687,6 @@ namespace MediaBrowser.Api.Library
                 {
                     EnableImages = false
                 }
-
             });
 
             if (!string.IsNullOrWhiteSpace(request.ImdbId))
@@ -763,8 +766,8 @@ namespace MediaBrowser.Api.Library
         {
             try
             {
-                _activityManager.Create(new Jellyfin.Data.Entities.ActivityLog(
-                    string.Format(_localization.GetLocalizedString("UserDownloadingItemWithValues"), user.Name, item.Name),
+                _activityManager.Create(new ActivityLog(
+                    string.Format(_localization.GetLocalizedString("UserDownloadingItemWithValues"), user.Username, item.Name),
                     "UserDownloadingContent",
                     auth.UserId)
                 {
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index 5fe4c0cca..b00a5fec8 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -7,6 +7,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Api.UserLibrary;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
@@ -678,7 +679,6 @@ namespace MediaBrowser.Api.LiveTv
     [Authenticated]
     public class GetTunerHostTypes : IReturn<List<NameIdPair>>
     {
-
     }
 
     [Route("/LiveTv/Tuners/Discvover", "GET")]
@@ -825,7 +825,6 @@ namespace MediaBrowser.Api.LiveTv
                 {
                     Name = i.Name,
                     Id = i.Id
-
                 }).ToList(),
 
                 Mappings = mappings,
@@ -844,7 +843,6 @@ namespace MediaBrowser.Api.LiveTv
             {
                 Url = "https://json.schedulesdirect.org/20141201/available/countries",
                 BufferContent = false
-
             }).ConfigureAwait(false);
 
             return ResultFactory.GetResult(Request, response, "application/json");
@@ -859,7 +857,7 @@ namespace MediaBrowser.Api.LiveTv
                 throw new SecurityException("Anonymous live tv management is not allowed.");
             }
 
-            if (!user.Policy.EnableLiveTvManagement)
+            if (!user.HasPermission(PermissionKind.EnableLiveTvManagement))
             {
                 throw new SecurityException("The current user does not have permission to manage live tv.");
             }
@@ -957,7 +955,6 @@ namespace MediaBrowser.Api.LiveTv
                 SortBy = request.GetOrderBy(),
                 SortOrder = request.SortOrder ?? SortOrder.Ascending,
                 AddCurrentProgram = request.AddCurrentProgram
-
             }, options, CancellationToken.None);
 
             var user = request.UserId.Equals(Guid.Empty) ? null : _userManager.GetUserById(request.UserId);
@@ -1112,7 +1109,6 @@ namespace MediaBrowser.Api.LiveTv
                 Fields = request.GetItemFields(),
                 ImageTypeLimit = request.ImageTypeLimit,
                 EnableImages = request.EnableImages
-
             }, options);
 
             return ToOptimizedResult(result);
@@ -1151,7 +1147,6 @@ namespace MediaBrowser.Api.LiveTv
                 SeriesTimerId = request.SeriesTimerId,
                 IsActive = request.IsActive,
                 IsScheduled = request.IsScheduled
-
             }, CancellationToken.None).ConfigureAwait(false);
 
             return ToOptimizedResult(result);
@@ -1187,7 +1182,6 @@ namespace MediaBrowser.Api.LiveTv
             {
                 SortOrder = request.SortOrder,
                 SortBy = request.SortBy
-
             }, CancellationToken.None).ConfigureAwait(false);
 
             return ToOptimizedResult(result);
diff --git a/MediaBrowser.Api/Movies/CollectionService.cs b/MediaBrowser.Api/Movies/CollectionService.cs
index 95a37dfc5..e9629439d 100644
--- a/MediaBrowser.Api/Movies/CollectionService.cs
+++ b/MediaBrowser.Api/Movies/CollectionService.cs
@@ -79,7 +79,6 @@ namespace MediaBrowser.Api.Movies
                 ParentId = parentId,
                 ItemIdList = SplitValue(request.Ids, ','),
                 UserIds = new[] { userId }
-
             });
 
             var dtoOptions = GetDtoOptions(_authContext, request);
diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs
index a9c7f5d6f..88ca0aa23 100644
--- a/MediaBrowser.Api/Movies/MoviesService.cs
+++ b/MediaBrowser.Api/Movies/MoviesService.cs
@@ -2,11 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Net;
@@ -15,6 +15,8 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
+using MetadataProvider = MediaBrowser.Model.Entities.MetadataProvider;
+using Movie = MediaBrowser.Controller.Entities.Movies.Movie;
 
 namespace MediaBrowser.Api.Movies
 {
@@ -159,8 +161,8 @@ namespace MediaBrowser.Api.Movies
                 IncludeItemTypes = new[]
                 {
                     typeof(Movie).Name,
-                    //typeof(Trailer).Name,
-                    //typeof(LiveTvProgram).Name
+                    // typeof(Trailer).Name,
+                    // typeof(LiveTvProgram).Name
                 },
                 // IsMovie = true
                 OrderBy = new[] { ItemSortBy.DatePlayed, ItemSortBy.Random }.Select(i => new ValueTuple<string, SortOrder>(i, SortOrder.Descending)).ToArray(),
@@ -192,7 +194,6 @@ namespace MediaBrowser.Api.Movies
                 ParentId = parentIdGuid,
                 Recursive = true,
                 DtoOptions = dtoOptions
-
             });
 
             var mostRecentMovies = recentlyPlayedMovies.Take(6).ToList();
@@ -251,7 +252,12 @@ namespace MediaBrowser.Api.Movies
             return categories.OrderBy(i => i.RecommendationType);
         }
 
-        private IEnumerable<RecommendationDto> GetWithDirector(User user, IEnumerable<string> names, int itemLimit, DtoOptions dtoOptions, RecommendationType type)
+        private IEnumerable<RecommendationDto> GetWithDirector(
+            User user,
+            IEnumerable<string> names,
+            int itemLimit,
+            DtoOptions dtoOptions,
+            RecommendationType type)
         {
             var itemTypes = new List<string> { typeof(Movie).Name };
             if (ServerConfigurationManager.Configuration.EnableExternalContentInSuggestions)
@@ -272,7 +278,6 @@ namespace MediaBrowser.Api.Movies
                     IsMovie = true,
                     EnableGroupByMetadataKey = true,
                     DtoOptions = dtoOptions
-
                 }).GroupBy(i => i.GetProviderId(MetadataProvider.Imdb) ?? Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture))
                 .Select(x => x.First())
                 .Take(itemLimit)
@@ -313,7 +318,6 @@ namespace MediaBrowser.Api.Movies
                     IsMovie = true,
                     EnableGroupByMetadataKey = true,
                     DtoOptions = dtoOptions
-
                 }).GroupBy(i => i.GetProviderId(MetadataProvider.Imdb) ?? Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture))
                 .Select(x => x.First())
                 .Take(itemLimit)
@@ -353,7 +357,6 @@ namespace MediaBrowser.Api.Movies
                     SimilarTo = item,
                     EnableGroupByMetadataKey = true,
                     DtoOptions = dtoOptions
-
                 });
 
                 if (similar.Count > 0)
diff --git a/MediaBrowser.Api/Movies/TrailersService.cs b/MediaBrowser.Api/Movies/TrailersService.cs
index 0b5334235..a7758b100 100644
--- a/MediaBrowser.Api/Movies/TrailersService.cs
+++ b/MediaBrowser.Api/Movies/TrailersService.cs
@@ -82,7 +82,6 @@ namespace MediaBrowser.Api.Movies
                 _authContext)
             {
                 Request = Request,
-
             }.Get(getItems);
         }
     }
diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index cacec8d64..ebd3eb64a 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -191,6 +192,5 @@ namespace MediaBrowser.Api.Music
 
             return result;
         }
-
     }
 }
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 24297d500..2eb6198c0 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
@@ -196,7 +197,7 @@ namespace MediaBrowser.Api.Playback
             if (state.VideoRequest != null && !EncodingHelper.IsCopyCodec(state.OutputVideoCodec))
             {
                 var auth = AuthorizationContext.GetAuthorizationInfo(Request);
-                if (auth.User != null && !auth.User.Policy.EnableVideoPlaybackTranscoding)
+                if (auth.User != null && !auth.User.HasPermission(PermissionKind.EnableVideoPlaybackTranscoding))
                 {
                     ApiEntryPoint.Instance.OnTranscodeFailedToStart(outputPath, TranscodingJobType, state);
 
@@ -215,7 +216,7 @@ namespace MediaBrowser.Api.Playback
                     UseShellExecute = false,
 
                     // Must consume both stdout and stderr or deadlocks may occur
-                    //RedirectStandardOutput = true,
+                    // RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     RedirectStandardInput = true,
 
@@ -684,7 +685,7 @@ namespace MediaBrowser.Api.Playback
                 state.User = UserManager.GetUserById(auth.UserId);
             }
 
-            //if ((Request.UserAgent ?? string.Empty).IndexOf("iphone", StringComparison.OrdinalIgnoreCase) != -1 ||
+            // if ((Request.UserAgent ?? string.Empty).IndexOf("iphone", StringComparison.OrdinalIgnoreCase) != -1 ||
             //    (Request.UserAgent ?? string.Empty).IndexOf("ipad", StringComparison.OrdinalIgnoreCase) != -1 ||
             //    (Request.UserAgent ?? string.Empty).IndexOf("ipod", StringComparison.OrdinalIgnoreCase) != -1)
             //{
@@ -715,9 +716,9 @@ namespace MediaBrowser.Api.Playback
 
             state.IsInputVideo = string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase);
 
-            //var primaryImage = item.GetImageInfo(ImageType.Primary, 0) ??
+            // var primaryImage = item.GetImageInfo(ImageType.Primary, 0) ??
             //             item.Parents.Select(i => i.GetImageInfo(ImageType.Primary, 0)).FirstOrDefault(i => i != null);
-            //if (primaryImage != null)
+            // if (primaryImage != null)
             //{
             //    state.AlbumCoverPath = primaryImage.Path;
             //}
@@ -884,7 +885,7 @@ namespace MediaBrowser.Api.Playback
                 if (transcodingProfile != null)
                 {
                     state.EstimateContentLength = transcodingProfile.EstimateContentLength;
-                    //state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
+                    // state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
                     state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
 
                     if (state.VideoRequest != null)
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 627421aac..c2d49a93b 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -178,7 +178,7 @@ namespace MediaBrowser.Api.Playback.Hls
             var newDuration = "#EXT-X-TARGETDURATION:" + segmentLength.ToString(CultureInfo.InvariantCulture);
 
             text = text.Replace("#EXT-X-TARGETDURATION:" + (segmentLength - 1).ToString(CultureInfo.InvariantCulture), newDuration, StringComparison.OrdinalIgnoreCase);
-            //text = text.Replace("#EXT-X-TARGETDURATION:" + (segmentLength + 1).ToString(CultureInfo.InvariantCulture), newDuration, StringComparison.OrdinalIgnoreCase);
+            // text = text.Replace("#EXT-X-TARGETDURATION:" + (segmentLength + 1).ToString(CultureInfo.InvariantCulture), newDuration, StringComparison.OrdinalIgnoreCase);
 
             return text;
         }
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 0a6ed2786..c0dfcf4c1 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -257,7 +257,7 @@ namespace MediaBrowser.Api.Playback.Hls
                             throw;
                         }
 
-                        //await WaitForMinimumSegmentCount(playlistPath, 1, cancellationTokenSource.Token).ConfigureAwait(false);
+                        // await WaitForMinimumSegmentCount(playlistPath, 1, cancellationTokenSource.Token).ConfigureAwait(false);
                     }
                     else
                     {
@@ -277,8 +277,8 @@ namespace MediaBrowser.Api.Playback.Hls
                 }
             }
 
-            //Logger.LogInformation("waiting for {0}", segmentPath);
-            //while (!File.Exists(segmentPath))
+            // Logger.LogInformation("waiting for {0}", segmentPath);
+            // while (!File.Exists(segmentPath))
             //{
             //    await Task.Delay(50, cancellationToken).ConfigureAwait(false);
             //}
@@ -717,7 +717,7 @@ namespace MediaBrowser.Api.Playback.Hls
 
             // Having problems in android
             return false;
-            //return state.VideoRequest.VideoBitRate.HasValue;
+            // return state.VideoRequest.VideoBitRate.HasValue;
         }
 
         /// <summary>
@@ -972,7 +972,7 @@ namespace MediaBrowser.Api.Playback.Hls
             var queryStringIndex = Request.RawUrl.IndexOf('?');
             var queryString = queryStringIndex == -1 ? string.Empty : Request.RawUrl.Substring(queryStringIndex);
 
-            //if ((Request.UserAgent ?? string.Empty).IndexOf("roku", StringComparison.OrdinalIgnoreCase) != -1)
+            // if ((Request.UserAgent ?? string.Empty).IndexOf("roku", StringComparison.OrdinalIgnoreCase) != -1)
             //{
             //    queryString = string.Empty;
             //}
@@ -1100,7 +1100,7 @@ namespace MediaBrowser.Api.Playback.Hls
                     }
                 }
 
-                //args += " -flags -global_header";
+                // args += " -flags -global_header";
             }
             else
             {
@@ -1142,7 +1142,7 @@ namespace MediaBrowser.Api.Playback.Hls
                     args += " " + keyFrameArg + gopArg;
                 }
 
-                //args += " -mixed-refs 0 -refs 3 -x264opts b_pyramid=0:weightb=0:weightp=0";
+                // args += " -mixed-refs 0 -refs 3 -x264opts b_pyramid=0:weightb=0:weightp=0";
 
                 var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
 
@@ -1164,7 +1164,7 @@ namespace MediaBrowser.Api.Playback.Hls
                     args += " -start_at_zero";
                 }
 
-                //args += " -flags -global_header";
+                // args += " -flags -global_header";
             }
 
             if (!string.IsNullOrEmpty(state.OutputVideoSync))
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index e2d771ec6..2dc62fda7 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
@@ -400,21 +401,24 @@ namespace MediaBrowser.Api.Playback
 
             if (item is Audio)
             {
-                Logger.LogInformation("User policy for {0}. EnableAudioPlaybackTranscoding: {1}", user.Name, user.Policy.EnableAudioPlaybackTranscoding);
+                Logger.LogInformation(
+                    "User policy for {0}. EnableAudioPlaybackTranscoding: {1}",
+                    user.Username,
+                    user.HasPermission(PermissionKind.EnableAudioPlaybackTranscoding));
             }
             else
             {
                 Logger.LogInformation("User policy for {0}. EnablePlaybackRemuxing: {1} EnableVideoPlaybackTranscoding: {2} EnableAudioPlaybackTranscoding: {3}",
-                    user.Name,
-                    user.Policy.EnablePlaybackRemuxing,
-                    user.Policy.EnableVideoPlaybackTranscoding,
-                    user.Policy.EnableAudioPlaybackTranscoding);
+                    user.Username,
+                    user.HasPermission(PermissionKind.EnablePlaybackRemuxing),
+                    user.HasPermission(PermissionKind.EnableVideoPlaybackTranscoding),
+                    user.HasPermission(PermissionKind.EnableAudioPlaybackTranscoding));
             }
 
             // Beginning of Playback Determination: Attempt DirectPlay first
             if (mediaSource.SupportsDirectPlay)
             {
-                if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
+                if (mediaSource.IsRemote && user.HasPermission(PermissionKind.ForceRemoteSourceTranscoding))
                 {
                     mediaSource.SupportsDirectPlay = false;
                 }
@@ -428,14 +432,16 @@ namespace MediaBrowser.Api.Playback
 
                     if (item is Audio)
                     {
-                        if (!user.Policy.EnableAudioPlaybackTranscoding)
+                        if (!user.HasPermission(PermissionKind.EnableAudioPlaybackTranscoding))
                         {
                             options.ForceDirectPlay = true;
                         }
                     }
                     else if (item is Video)
                     {
-                        if (!user.Policy.EnableAudioPlaybackTranscoding && !user.Policy.EnableVideoPlaybackTranscoding && !user.Policy.EnablePlaybackRemuxing)
+                        if (!user.HasPermission(PermissionKind.EnableAudioPlaybackTranscoding)
+                            && !user.HasPermission(PermissionKind.EnableVideoPlaybackTranscoding)
+                            && !user.HasPermission(PermissionKind.EnablePlaybackRemuxing))
                         {
                             options.ForceDirectPlay = true;
                         }
@@ -463,7 +469,7 @@ namespace MediaBrowser.Api.Playback
 
             if (mediaSource.SupportsDirectStream)
             {
-                if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
+                if (mediaSource.IsRemote && user.HasPermission(PermissionKind.ForceRemoteSourceTranscoding))
                 {
                     mediaSource.SupportsDirectStream = false;
                 }
@@ -473,14 +479,16 @@ namespace MediaBrowser.Api.Playback
 
                     if (item is Audio)
                     {
-                        if (!user.Policy.EnableAudioPlaybackTranscoding)
+                        if (!user.HasPermission(PermissionKind.EnableAudioPlaybackTranscoding))
                         {
                             options.ForceDirectStream = true;
                         }
                     }
                     else if (item is Video)
                     {
-                        if (!user.Policy.EnableAudioPlaybackTranscoding && !user.Policy.EnableVideoPlaybackTranscoding && !user.Policy.EnablePlaybackRemuxing)
+                        if (!user.HasPermission(PermissionKind.EnableAudioPlaybackTranscoding)
+                            && !user.HasPermission(PermissionKind.EnableVideoPlaybackTranscoding)
+                            && !user.HasPermission(PermissionKind.EnablePlaybackRemuxing))
                         {
                             options.ForceDirectStream = true;
                         }
@@ -512,7 +520,7 @@ namespace MediaBrowser.Api.Playback
                     ? streamBuilder.BuildAudioItem(options)
                     : streamBuilder.BuildVideoItem(options);
 
-                if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
+                if (mediaSource.IsRemote && user.HasPermission(PermissionKind.ForceRemoteSourceTranscoding))
                 {
                     if (streamInfo != null)
                     {
@@ -576,10 +584,10 @@ namespace MediaBrowser.Api.Playback
             }
         }
 
-        private long? GetMaxBitrate(long? clientMaxBitrate, User user)
+        private long? GetMaxBitrate(long? clientMaxBitrate, Jellyfin.Data.Entities.User user)
         {
             var maxBitrate = clientMaxBitrate;
-            var remoteClientMaxBitrate = user?.Policy.RemoteClientBitrateLimit ?? 0;
+            var remoteClientMaxBitrate = user?.RemoteClientBitrateLimit ?? 0;
 
             if (remoteClientMaxBitrate <= 0)
             {
@@ -638,7 +646,6 @@ namespace MediaBrowser.Api.Playback
                 }
 
                 return 1;
-
             }).ThenBy(i =>
             {
                 // Let's assume direct streaming a file is just as desirable as direct playing a remote url
@@ -648,7 +655,6 @@ namespace MediaBrowser.Api.Playback
                 }
 
                 return 1;
-
             }).ThenBy(i =>
             {
                 return i.Protocol switch
@@ -664,7 +670,6 @@ namespace MediaBrowser.Api.Playback
                 }
 
                 return 1;
-
             }).ThenBy(originalList.IndexOf)
             .ToArray();
         }
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
index c7bf055fb..43cde440c 100644
--- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
@@ -231,7 +231,7 @@ namespace MediaBrowser.Api.Playback.Progressive
             }
 
             //// Not static but transcode cache file exists
-            //if (isTranscodeCached && state.VideoRequest == null)
+            // if (isTranscodeCached && state.VideoRequest == null)
             //{
             //    var contentType = state.GetMimeType(outputPath);
 
diff --git a/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs b/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
index a53b848f9..ffc5e1554 100644
--- a/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
+++ b/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
@@ -96,8 +96,8 @@ namespace MediaBrowser.Api.Playback.Progressive
                             bytesRead = await CopyToInternalAsyncWithSyncRead(inputStream, outputStream, cancellationToken).ConfigureAwait(false);
                         }
 
-                        //var position = fs.Position;
-                        //_logger.LogDebug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
+                        // var position = fs.Position;
+                        // _logger.LogDebug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
 
                         if (bytesRead == 0)
                         {
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index 4de81655c..a35e6c201 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -59,7 +59,6 @@ namespace MediaBrowser.Api.Playback.Progressive
     [Route("/Videos/{Id}/stream", "HEAD")]
     public class GetVideoStream : VideoStreamRequest
     {
-
     }
 
     /// <summary>
diff --git a/MediaBrowser.Api/Playback/UniversalAudioService.cs b/MediaBrowser.Api/Playback/UniversalAudioService.cs
index a3b319d44..b2d101a5b 100644
--- a/MediaBrowser.Api/Playback/UniversalAudioService.cs
+++ b/MediaBrowser.Api/Playback/UniversalAudioService.cs
@@ -259,7 +259,6 @@ namespace MediaBrowser.Api.Playback
                 UserId = request.UserId,
                 DeviceProfile = deviceProfile,
                 MediaSourceId = request.MediaSourceId
-
             }).ConfigureAwait(false);
 
             var mediaSource = playbackInfoResult.MediaSources[0];
diff --git a/MediaBrowser.Api/PlaylistService.cs b/MediaBrowser.Api/PlaylistService.cs
index 953b00e35..d5def03be 100644
--- a/MediaBrowser.Api/PlaylistService.cs
+++ b/MediaBrowser.Api/PlaylistService.cs
@@ -161,7 +161,6 @@ namespace MediaBrowser.Api
                 ItemIdList = GetGuids(request.Ids),
                 UserId = request.UserId,
                 MediaType = request.MediaType
-
             }).ConfigureAwait(false);
 
             return ToOptimizedResult(result);
diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs
index 7f74511ee..fd1075727 100644
--- a/MediaBrowser.Api/PluginService.cs
+++ b/MediaBrowser.Api/PluginService.cs
@@ -75,7 +75,7 @@ namespace MediaBrowser.Api
         public Stream RequestStream { get; set; }
     }
 
-    //TODO Once we have proper apps and plugins and decide to break compatibility with paid plugins,
+    // TODO Once we have proper apps and plugins and decide to break compatibility with paid plugins,
     // delete all these registration endpoints. They are only kept for compatibility.
     [Route("/Registrations/{Name}", "GET", Summary = "Gets registration status for a feature", IsHidden = true)]
     [Authenticated]
diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs
index e9d339c6e..4a2f96ed8 100644
--- a/MediaBrowser.Api/SearchService.cs
+++ b/MediaBrowser.Api/SearchService.cs
@@ -180,7 +180,6 @@ namespace MediaBrowser.Api
                 IsNews = request.IsNews,
                 IsSeries = request.IsSeries,
                 IsSports = request.IsSports
-
             });
 
             return new SearchHintResult
diff --git a/MediaBrowser.Api/Sessions/SessionService.cs b/MediaBrowser.Api/Sessions/SessionService.cs
index 020bb5042..d986eea65 100644
--- a/MediaBrowser.Api/Sessions/SessionService.cs
+++ b/MediaBrowser.Api/Sessions/SessionService.cs
@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
@@ -326,12 +327,12 @@ namespace MediaBrowser.Api.Sessions
 
                 var user = _userManager.GetUserById(request.ControllableByUserId);
 
-                if (!user.Policy.EnableRemoteControlOfOtherUsers)
+                if (!user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers))
                 {
                     result = result.Where(i => i.UserId.Equals(Guid.Empty) || i.ContainsUser(request.ControllableByUserId));
                 }
 
-                if (!user.Policy.EnableSharedDeviceControl)
+                if (!user.HasPermission(PermissionKind.EnableSharedDeviceControl))
                 {
                     result = result.Where(i => !i.UserId.Equals(Guid.Empty));
                 }
diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs
index dcd22280a..90c324ff3 100644
--- a/MediaBrowser.Api/SimilarItemsHelper.cs
+++ b/MediaBrowser.Api/SimilarItemsHelper.cs
@@ -218,6 +218,5 @@ namespace MediaBrowser.Api
 
             return points;
         }
-
     }
 }
diff --git a/MediaBrowser.Api/SuggestionsService.cs b/MediaBrowser.Api/SuggestionsService.cs
index 91f85db6f..32d3bde5c 100644
--- a/MediaBrowser.Api/SuggestionsService.cs
+++ b/MediaBrowser.Api/SuggestionsService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index c57cc93d5..4f10a4ad2 100644
--- a/MediaBrowser.Api/System/SystemService.cs
+++ b/MediaBrowser.Api/System/SystemService.cs
@@ -24,20 +24,17 @@ namespace MediaBrowser.Api.System
     [Authenticated(EscapeParentalControl = true, AllowBeforeStartupWizard = true)]
     public class GetSystemInfo : IReturn<SystemInfo>
     {
-
     }
 
     [Route("/System/Info/Public", "GET", Summary = "Gets public information about the server")]
     public class GetPublicSystemInfo : IReturn<PublicSystemInfo>
     {
-
     }
 
     [Route("/System/Ping", "POST")]
     [Route("/System/Ping", "GET")]
     public class PingSystem : IReturnVoid
     {
-
     }
 
     /// <summary>
@@ -83,7 +80,6 @@ namespace MediaBrowser.Api.System
     [Authenticated]
     public class GetWakeOnLanInfo : IReturn<WakeOnLanInfo[]>
     {
-
     }
 
     /// <summary>
@@ -153,7 +149,6 @@ namespace MediaBrowser.Api.System
                 DateModified = _fileSystem.GetLastWriteTimeUtc(i),
                 Name = i.Name,
                 Size = i.Length
-
             }).OrderByDescending(i => i.DateModified)
                 .ThenByDescending(i => i.DateCreated)
                 .ThenBy(i => i.Name)
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index cd8e8dfbe..23062b67b 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -306,7 +306,6 @@ namespace MediaBrowser.Api
                 ParentId = parentIdGuid,
                 Recursive = true,
                 DtoOptions = options
-
             });
 
             var returnItems = _dtoService.GetBaseItemDtos(itemsResult, options, user);
@@ -378,7 +377,7 @@ namespace MediaBrowser.Api
         {
             var user = _userManager.GetUserById(request.UserId);
 
-            var series = GetSeries(request.Id, user);
+            var series = GetSeries(request.Id);
 
             if (series == null)
             {
@@ -390,7 +389,6 @@ namespace MediaBrowser.Api
                 IsMissing = request.IsMissing,
                 IsSpecialSeason = request.IsSpecialSeason,
                 AdjacentTo = request.AdjacentTo
-
             });
 
             var dtoOptions = GetDtoOptions(_authContext, request);
@@ -404,7 +402,7 @@ namespace MediaBrowser.Api
             };
         }
 
-        private Series GetSeries(string seriesId, User user)
+        private Series GetSeries(string seriesId)
         {
             if (!string.IsNullOrWhiteSpace(seriesId))
             {
@@ -433,7 +431,7 @@ namespace MediaBrowser.Api
             }
             else if (request.Season.HasValue)
             {
-                var series = GetSeries(request.Id, user);
+                var series = GetSeries(request.Id);
 
                 if (series == null)
                 {
@@ -446,7 +444,7 @@ namespace MediaBrowser.Api
             }
             else
             {
-                var series = GetSeries(request.Id, user);
+                var series = GetSeries(request.Id);
 
                 if (series == null)
                 {
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
index 559082ff4..4802849f4 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -321,7 +322,6 @@ namespace MediaBrowser.Api.UserLibrary
                 {
                     ibnItems = ibnItems.Take(request.Limit.Value);
                 }
-
             }
 
             var tuples = ibnItems.Select(i => new Tuple<BaseItem, List<BaseItem>>(i, new List<BaseItem>()));
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index f3c0441e1..49d534c36 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -2,10 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dto;
@@ -14,6 +15,7 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
+using MusicAlbum = MediaBrowser.Controller.Entities.Audio.MusicAlbum;
 
 namespace MediaBrowser.Api.UserLibrary
 {
@@ -86,7 +88,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var ancestorIds = Array.Empty<Guid>();
 
-            var excludeFolderIds = user.Configuration.LatestItemsExcludes;
+            var excludeFolderIds = user.GetPreference(PreferenceKind.LatestItemExcludes);
             if (parentIdGuid.Equals(Guid.Empty) && excludeFolderIds.Length > 0)
             {
                 ancestorIds = _libraryManager.GetUserRootFolder().GetChildren(user, true)
@@ -211,14 +213,14 @@ namespace MediaBrowser.Api.UserLibrary
                 request.IncludeItemTypes = "Playlist";
             }
 
-            bool isInEnabledFolder = user.Policy.EnabledFolders.Any(i => new Guid(i) == item.Id)
+            bool isInEnabledFolder = user.GetPreference(PreferenceKind.EnabledFolders).Any(i => new Guid(i) == item.Id)
                     // Assume all folders inside an EnabledChannel are enabled
-                    || user.Policy.EnabledChannels.Any(i => new Guid(i) == item.Id);
+                    || user.GetPreference(PreferenceKind.EnabledChannels).Any(i => new Guid(i) == item.Id);
 
             var collectionFolders = _libraryManager.GetCollectionFolders(item);
             foreach (var collectionFolder in collectionFolders)
             {
-                if (user.Policy.EnabledFolders.Contains(
+                if (user.GetPreference(PreferenceKind.EnabledFolders).Contains(
                     collectionFolder.Id.ToString("N", CultureInfo.InvariantCulture),
                     StringComparer.OrdinalIgnoreCase))
                 {
@@ -226,9 +228,12 @@ namespace MediaBrowser.Api.UserLibrary
                 }
             }
 
-            if (!(item is UserRootFolder) && !user.Policy.EnableAllFolders && !isInEnabledFolder && !user.Policy.EnableAllChannels)
+            if (!(item is UserRootFolder)
+                && !isInEnabledFolder
+                && !user.HasPermission(PermissionKind.EnableAllFolders)
+                && !user.HasPermission(PermissionKind.EnableAllChannels))
             {
-                Logger.LogWarning("{UserName} is not permitted to access Library {ItemName}.", user.Name, item.Name);
+                Logger.LogWarning("{UserName} is not permitted to access Library {ItemName}.", user.Username, item.Name);
                 return new QueryResult<BaseItem>
                 {
                     Items = Array.Empty<BaseItem>(),
diff --git a/MediaBrowser.Api/UserLibrary/PlaystateService.cs b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
index d0faca163..ab231626b 100644
--- a/MediaBrowser.Api/UserLibrary/PlaystateService.cs
+++ b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Globalization;
 using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 7fa750adb..f75852885 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -312,7 +312,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             if (!request.IsPlayed.HasValue)
             {
-                if (user.Configuration.HidePlayedInLatest)
+                if (user.HidePlayedInLatest)
                 {
                     request.IsPlayed = false;
                 }
diff --git a/MediaBrowser.Api/UserLibrary/UserViewsService.cs b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
index 0fffb0622..73d5ec6de 100644
--- a/MediaBrowser.Api/UserLibrary/UserViewsService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
@@ -129,7 +129,6 @@ namespace MediaBrowser.Api.UserLibrary
                 {
                     Name = i.Name,
                     Id = i.Id.ToString("N", CultureInfo.InvariantCulture)
-
                 })
             .OrderBy(i => i.Name)
             .ToArray();
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 78fc6c694..9cb9baf63 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Authentication;
@@ -300,12 +301,12 @@ namespace MediaBrowser.Api
 
             if (request.IsDisabled.HasValue)
             {
-                users = users.Where(i => i.Policy.IsDisabled == request.IsDisabled.Value);
+                users = users.Where(i => i.HasPermission(PermissionKind.IsDisabled) == request.IsDisabled.Value);
             }
 
             if (request.IsHidden.HasValue)
             {
-                users = users.Where(i => i.Policy.IsHidden == request.IsHidden.Value);
+                users = users.Where(i => i.HasPermission(PermissionKind.IsHidden) == request.IsHidden.Value);
             }
 
             if (filterByDevice)
@@ -322,12 +323,12 @@ namespace MediaBrowser.Api
             {
                 if (!_networkManager.IsInLocalNetwork(Request.RemoteIp))
                 {
-                    users = users.Where(i => i.Policy.EnableRemoteAccess);
+                    users = users.Where(i => i.HasPermission(PermissionKind.EnableRemoteAccess));
                 }
             }
 
             var result = users
-                .OrderBy(u => u.Name)
+                .OrderBy(u => u.Username)
                 .Select(i => _userManager.GetUserDto(i, Request.RemoteIp))
                 .ToArray();
 
@@ -397,7 +398,7 @@ namespace MediaBrowser.Api
             // Password should always be null
             return Post(new AuthenticateUserByName
             {
-                Username = user.Name,
+                Username = user.Username,
                 Password = null,
                 Pw = request.Pw
             });
@@ -456,7 +457,12 @@ namespace MediaBrowser.Api
             }
             else
             {
-                var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPw, request.CurrentPassword, Request.RemoteIp, false).ConfigureAwait(false);
+                var success = await _userManager.AuthenticateUser(
+                    user.Username,
+                    request.CurrentPw,
+                    request.CurrentPassword,
+                    Request.RemoteIp,
+                    false).ConfigureAwait(false);
 
                 if (success == null)
                 {
@@ -506,10 +512,10 @@ namespace MediaBrowser.Api
 
             var user = _userManager.GetUserById(id);
 
-            if (string.Equals(user.Name, dtoUser.Name, StringComparison.Ordinal))
+            if (string.Equals(user.Username, dtoUser.Name, StringComparison.Ordinal))
             {
-                _userManager.UpdateUser(user);
-                _userManager.UpdateConfiguration(user, dtoUser.Configuration);
+                await _userManager.UpdateUserAsync(user);
+                _userManager.UpdateConfiguration(user.Id, dtoUser.Configuration);
             }
             else
             {
@@ -560,7 +566,6 @@ namespace MediaBrowser.Api
             AssertCanUpdateUser(_authContext, _userManager, request.Id, false);
 
             _userManager.UpdateConfiguration(request.Id, request);
-
         }
 
         public void Post(UpdateUserPolicy request)
@@ -568,24 +573,24 @@ namespace MediaBrowser.Api
             var user = _userManager.GetUserById(request.Id);
 
             // If removing admin access
-            if (!request.IsAdministrator && user.Policy.IsAdministrator)
+            if (!request.IsAdministrator && user.HasPermission(PermissionKind.IsAdministrator))
             {
-                if (_userManager.Users.Count(i => i.Policy.IsAdministrator) == 1)
+                if (_userManager.Users.Count(i => i.HasPermission(PermissionKind.IsAdministrator)) == 1)
                 {
                     throw new ArgumentException("There must be at least one user in the system with administrative access.");
                 }
             }
 
             // If disabling
-            if (request.IsDisabled && user.Policy.IsAdministrator)
+            if (request.IsDisabled && user.HasPermission(PermissionKind.IsAdministrator))
             {
                 throw new ArgumentException("Administrators cannot be disabled.");
             }
 
             // If disabling
-            if (request.IsDisabled && !user.Policy.IsDisabled)
+            if (request.IsDisabled && !user.HasPermission(PermissionKind.IsDisabled))
             {
-                if (_userManager.Users.Count(i => !i.Policy.IsDisabled) == 1)
+                if (_userManager.Users.Count(i => !i.HasPermission(PermissionKind.IsDisabled)) == 1)
                 {
                     throw new ArgumentException("There must be at least one enabled user in the system.");
                 }
@@ -594,7 +599,7 @@ namespace MediaBrowser.Api
                 _sessionMananger.RevokeUserTokens(user.Id, currentToken);
             }
 
-            _userManager.UpdateUserPolicy(request.Id, request);
+            _userManager.UpdatePolicy(request.Id, request);
         }
     }
 }