Merge pull request #2566 from MediaBrowser/dev

Dev

Emby.Server.Implementations/Library/UserManager.cs

@@ -182,7 +182,7 @@ namespace Emby.Server.Implementations.Library
             }
         }
 
-        public Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint)
+        public Task<User> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint)
         {
             return AuthenticateUser(username, passwordSha1, null, remoteEndPoint);
         }
@@ -226,7 +226,7 @@ namespace Emby.Server.Implementations.Library
             return builder.ToString();
         }
 
-        public async Task<bool> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint)
+        public async Task<User> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint)
         {
             if (string.IsNullOrWhiteSpace(username))
             {
@@ -307,7 +307,7 @@ namespace Emby.Server.Implementations.Library
 
             _logger.Info("Authentication request for {0} {1}.", user.Name, success ? "has succeeded" : "has been denied");
 
-            return success;
+            return success ? user : null;
         }
 
         private async Task UpdateInvalidLoginAttemptCount(User user, int newValue)

Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs

@@ -227,11 +227,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             throw new LiveTvConflictException();
         }
 
-        protected virtual bool EnableMediaProbing
-        {
-            get { return false; }
-        }
-
         protected async Task<bool> IsAvailable(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
         {
             try

Emby.Server.Implementations/Session/SessionManager.cs

@@ -1404,12 +1404,14 @@ namespace Emby.Server.Implementations.Session
             {
                 var result = await _userManager.AuthenticateUser(request.Username, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false);
 
-                if (!result)
+                if (result == null)
                 {
                     EventHelper.FireEventIfNotNull(AuthenticationFailed, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
 
                     throw new SecurityException("Invalid user or password entered.");
                 }
+
+                user = result;
             }
 
             var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.AppVersion, request.DeviceName).ConfigureAwait(false);

MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs

@@ -443,7 +443,7 @@ namespace MediaBrowser.Api.Playback.Hls
                 var currentTranscodingIndex = GetCurrentTranscodingIndex(playlistPath, segmentExtension);
 
                 // If requested segment is less than transcoding position, we can't transcode backwards, so assume it's ready
-                if (segmentIndex < currentTranscodingIndex)
+                if (segmentIndex != currentTranscodingIndex)
                 {
                     return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false);
                 }

MediaBrowser.Api/UserService.cs

@@ -461,7 +461,7 @@ namespace MediaBrowser.Api
             {
                 var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).ConfigureAwait(false);
 
-                if (!success)
+                if (success != null)
                 {
                     throw new ArgumentException("Invalid user or password entered.");
                 }

MediaBrowser.Controller/Library/IUserManager.cs

@@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="remoteEndPoint">The remote end point.</param>
         /// <returns>Task{System.Boolean}.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint);
+        Task<User> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint);
         
         /// <summary>
         /// Refreshes metadata for each user
@@ -164,7 +164,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="passwordMd5">The password MD5.</param>
         /// <param name="remoteEndPoint">The remote end point.</param>
         /// <returns>Task&lt;System.Boolean&gt;.</returns>
-        Task<bool> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint);
+        Task<User> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint);
 
         /// <summary>
         /// Starts the forgot password process.

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.10.6")]
+[assembly: AssemblyVersion("3.2.10.7")]