From 344f3d66ef45bafb6bc0fb7d3464f4f80bc2774e Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 2 Feb 2015 11:54:49 -0800 Subject: [PATCH] Reloading the page before restarting won't break the UI when changing authentication method --- src/NzbDrone.Api/Authentication/AuthenticationService.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Api/Authentication/AuthenticationService.cs b/src/NzbDrone.Api/Authentication/AuthenticationService.cs index e23bb89ae..112bfdb43 100644 --- a/src/NzbDrone.Api/Authentication/AuthenticationService.cs +++ b/src/NzbDrone.Api/Authentication/AuthenticationService.cs @@ -21,18 +21,21 @@ namespace NzbDrone.Api.Authentication private readonly IConfigFileProvider _configFileProvider; private readonly IUserService _userService; private static readonly NzbDroneUser AnonymousUser = new NzbDroneUser { UserName = "Anonymous" }; + private static String API_KEY; + private static AuthenticationType AUTH_METHOD; public AuthenticationService(IConfigFileProvider configFileProvider, IUserService userService) { _configFileProvider = configFileProvider; _userService = userService; API_KEY = configFileProvider.ApiKey; + AUTH_METHOD = configFileProvider.AuthenticationMethod; } public IUserIdentity Validate(string username, string password) { - if (_configFileProvider.AuthenticationMethod == AuthenticationType.None) + if (AUTH_METHOD == AuthenticationType.None) { return AnonymousUser; } @@ -49,7 +52,7 @@ namespace NzbDrone.Api.Authentication public IUserIdentity GetUserFromIdentifier(Guid identifier, NancyContext context) { - if (_configFileProvider.AuthenticationMethod == AuthenticationType.None) + if (AUTH_METHOD == AuthenticationType.None) { return AnonymousUser; } @@ -73,7 +76,7 @@ namespace NzbDrone.Api.Authentication return ValidApiKey(apiKey); } - if (_configFileProvider.AuthenticationMethod == AuthenticationType.None) + if (AUTH_METHOD == AuthenticationType.None) { return true; }