Reloading the page before restarting won't break the UI when changing authentication method

This commit is contained in:
Mark McDowall 2015-02-02 11:54:49 -08:00
parent 27d3ecf6b2
commit 344f3d66ef
1 changed files with 6 additions and 3 deletions

View File

@ -21,18 +21,21 @@ namespace NzbDrone.Api.Authentication
private readonly IConfigFileProvider _configFileProvider; private readonly IConfigFileProvider _configFileProvider;
private readonly IUserService _userService; private readonly IUserService _userService;
private static readonly NzbDroneUser AnonymousUser = new NzbDroneUser { UserName = "Anonymous" }; private static readonly NzbDroneUser AnonymousUser = new NzbDroneUser { UserName = "Anonymous" };
private static String API_KEY; private static String API_KEY;
private static AuthenticationType AUTH_METHOD;
public AuthenticationService(IConfigFileProvider configFileProvider, IUserService userService) public AuthenticationService(IConfigFileProvider configFileProvider, IUserService userService)
{ {
_configFileProvider = configFileProvider; _configFileProvider = configFileProvider;
_userService = userService; _userService = userService;
API_KEY = configFileProvider.ApiKey; API_KEY = configFileProvider.ApiKey;
AUTH_METHOD = configFileProvider.AuthenticationMethod;
} }
public IUserIdentity Validate(string username, string password) public IUserIdentity Validate(string username, string password)
{ {
if (_configFileProvider.AuthenticationMethod == AuthenticationType.None) if (AUTH_METHOD == AuthenticationType.None)
{ {
return AnonymousUser; return AnonymousUser;
} }
@ -49,7 +52,7 @@ namespace NzbDrone.Api.Authentication
public IUserIdentity GetUserFromIdentifier(Guid identifier, NancyContext context) public IUserIdentity GetUserFromIdentifier(Guid identifier, NancyContext context)
{ {
if (_configFileProvider.AuthenticationMethod == AuthenticationType.None) if (AUTH_METHOD == AuthenticationType.None)
{ {
return AnonymousUser; return AnonymousUser;
} }
@ -73,7 +76,7 @@ namespace NzbDrone.Api.Authentication
return ValidApiKey(apiKey); return ValidApiKey(apiKey);
} }
if (_configFileProvider.AuthenticationMethod == AuthenticationType.None) if (AUTH_METHOD == AuthenticationType.None)
{ {
return true; return true;
} }