lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable nullable annotations

Browse Source
This commit is contained in:
Patrick Barron 2020-06-09 12:21:21 -04:00
parent d85308b474
commit ce737c31ec
5 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
View File

@ -1,3 +1,5 @@
#nullable enable
using System;
using System.Linq;
using System.Text;
@ -129,7 +131,7 @@ namespace Jellyfin.Server.Implementations.Users
}
/// <inheritdoc />
public string GetEasyPasswordHash(User user)
public string? GetEasyPasswordHash(User user)
{
return string.IsNullOrEmpty(user.EasyPassword)
? null

3
Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
View File

@ -1,3 +1,5 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.IO;
@ -128,6 +130,7 @@ namespace Jellyfin.Server.Implementations.Users
};
}
#nullable disable
private class SerializablePasswordReset : PasswordPinCreationResult
{
public string Pin { get; set; }

5
Jellyfin.Server.Implementations/Users/DeviceAccessEntryPoint.cs
View File

@ -1,4 +1,5 @@
#pragma warning disable CS1591
#nullable enable
#pragma warning disable CS1591
using System.Threading.Tasks;
using Jellyfin.Data.Entities;
@ -38,7 +39,7 @@ namespace Jellyfin.Server.Implementations.Users
{
}
private void OnUserUpdated(object sender, GenericEventArgs<User> e)
private void OnUserUpdated(object? sender, GenericEventArgs<User> e)
{
var user = e.Argument;
if (!user.HasPermission(PermissionKind.EnableAllDevices))

2
Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs
View File

@ -1,3 +1,5 @@
#nullable enable
using System.Threading.Tasks;
using Jellyfin.Data.Entities;
using MediaBrowser.Controller.Authentication;

45
Jellyfin.Server.Implementations/Users/UserManager.cs
View File

@ -1,4 +1,5 @@
#pragma warning disable CA1307
#nullable enable
#pragma warning disable CA1307
using System;
using System.Collections.Generic;
@ -37,11 +38,11 @@ namespace Jellyfin.Server.Implementations.Users
private readonly IImageProcessor _imageProcessor;
private readonly ILogger<UserManager> _logger;
private IAuthenticationProvider[] _authenticationProviders;
private DefaultAuthenticationProvider _defaultAuthenticationProvider;
private InvalidAuthProvider _invalidAuthProvider;
private IPasswordResetProvider[] _passwordResetProviders;
private DefaultPasswordResetProvider _defaultPasswordResetProvider;
private IAuthenticationProvider[] _authenticationProviders = null!;
private DefaultAuthenticationProvider _defaultAuthenticationProvider = null!;
private InvalidAuthProvider _invalidAuthProvider = null!;
private IPasswordResetProvider[] _passwordResetProviders = null!;
private DefaultPasswordResetProvider _defaultPasswordResetProvider = null!;
/// <summary>
/// Initializes a new instance of the <see cref="UserManager"/> class.
@ -69,19 +70,19 @@ namespace Jellyfin.Server.Implementations.Users
}
/// <inheritdoc/>
public event EventHandler<GenericEventArgs<User>> OnUserPasswordChanged;
public event EventHandler<GenericEventArgs<User>>? OnUserPasswordChanged;
/// <inheritdoc/>
public event EventHandler<GenericEventArgs<User>> OnUserUpdated;
public event EventHandler<GenericEventArgs<User>>? OnUserUpdated;
/// <inheritdoc/>
public event EventHandler<GenericEventArgs<User>> OnUserCreated;
public event EventHandler<GenericEventArgs<User>>? OnUserCreated;
/// <inheritdoc/>
public event EventHandler<GenericEventArgs<User>> OnUserDeleted;
public event EventHandler<GenericEventArgs<User>>? OnUserDeleted;
/// <inheritdoc/>
public event EventHandler<GenericEventArgs<User>> OnUserLockedOut;
public event EventHandler<GenericEventArgs<User>>? OnUserLockedOut;
/// <inheritdoc/>
public IEnumerable<User> Users => _dbProvider.CreateContext().Users;
@ -90,7 +91,7 @@ namespace Jellyfin.Server.Implementations.Users
public IEnumerable<Guid> UsersIds => _dbProvider.CreateContext().Users.Select(u => u.Id);
/// <inheritdoc/>
public User GetUserById(Guid id)
public User? GetUserById(Guid id)
{
if (id == Guid.Empty)
{
@ -101,7 +102,7 @@ namespace Jellyfin.Server.Implementations.Users
}
/// <inheritdoc/>
public User GetUserByName(string name)
public User? GetUserByName(string name)
{
if (string.IsNullOrWhiteSpace(name))
{
@ -260,7 +261,7 @@ namespace Jellyfin.Server.Implementations.Users
}
/// <inheritdoc/>
public void ChangeEasyPassword(User user, string newPassword, string newPasswordSha1)
public void ChangeEasyPassword(User user, string newPassword, string? newPasswordSha1)
{
GetAuthenticationProvider(user).ChangeEasyPassword(user, newPassword, newPasswordSha1);
UpdateUser(user);
@ -269,7 +270,7 @@ namespace Jellyfin.Server.Implementations.Users
}
/// <inheritdoc/>
public UserDto GetUserDto(User user, string remoteEndPoint = null)
public UserDto GetUserDto(User user, string? remoteEndPoint = null)
{
var hasPassword = GetAuthenticationProvider(user).HasPassword(user);
return new UserDto
@ -344,7 +345,7 @@ namespace Jellyfin.Server.Implementations.Users
}
/// <inheritdoc/>
public async Task<User> AuthenticateUser(
public async Task<User?> AuthenticateUser(
string username,
string password,
string passwordSha1,
@ -359,7 +360,7 @@ namespace Jellyfin.Server.Implementations.Users
var user = Users.ToList().FirstOrDefault(i => string.Equals(username, i.Username, StringComparison.OrdinalIgnoreCase));
bool success;
IAuthenticationProvider authenticationProvider;
IAuthenticationProvider? authenticationProvider;
if (user != null)
{
@ -651,7 +652,7 @@ namespace Jellyfin.Server.Implementations.Users
return GetPasswordResetProviders(user)[0];
}
private IList<IAuthenticationProvider> GetAuthenticationProviders(User user)
private IList<IAuthenticationProvider> GetAuthenticationProviders(User? user)
{
var authenticationProviderId = user?.AuthenticationProviderId;
@ -701,14 +702,14 @@ namespace Jellyfin.Server.Implementations.Users
return providers;
}
private async Task<(IAuthenticationProvider authenticationProvider, string username, bool success)> AuthenticateLocalUser(
private async Task<(IAuthenticationProvider? authenticationProvider, string username, bool success)> AuthenticateLocalUser(
string username,
string password,
User user,
User? user,
string remoteEndPoint)
{
bool success = false;
IAuthenticationProvider authenticationProvider = null;
IAuthenticationProvider? authenticationProvider = null;
foreach (var provider in GetAuthenticationProviders(user))
{
@ -746,7 +747,7 @@ namespace Jellyfin.Server.Implementations.Users
IAuthenticationProvider provider,
string username,
string password,
User resolvedUser)
User? resolvedUser)
{
try
{