From 27b85aa08f920e7013c3944f9ba5d6c1a435d656 Mon Sep 17 00:00:00 2001 From: Zeegaan <70372949+Zeegaan@users.noreply.github.com> Date: Wed, 22 Sep 2021 13:45:04 +0200 Subject: [PATCH] Updated AuthenticationController to use IOptionsMonitor, but not subscribed to events --- .../Controllers/AuthenticationController.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs index f159011d80..baa1ca0e09 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs @@ -60,11 +60,11 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers private readonly IUserService _userService; private readonly ILocalizedTextService _textService; private readonly IUmbracoMapper _umbracoMapper; - private readonly GlobalSettings _globalSettings; - private readonly SecuritySettings _securitySettings; + private GlobalSettings _globalSettings; + private SecuritySettings _securitySettings; private readonly ILogger _logger; private readonly IIpResolver _ipResolver; - private readonly UserPasswordConfigurationSettings _passwordConfiguration; + private UserPasswordConfigurationSettings _passwordConfiguration; private readonly IEmailSender _emailSender; private readonly ISmsSender _smsSender; private readonly IHostingEnvironment _hostingEnvironment; @@ -81,11 +81,11 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers IUserService userService, ILocalizedTextService textService, IUmbracoMapper umbracoMapper, - IOptions globalSettings, - IOptions securitySettings, + IOptionsMonitor globalSettings, + IOptionsMonitor securitySettings, ILogger logger, IIpResolver ipResolver, - IOptions passwordConfiguration, + IOptionsMonitor passwordConfiguration, IEmailSender emailSender, ISmsSender smsSender, IHostingEnvironment hostingEnvironment, @@ -99,17 +99,18 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers _userService = userService; _textService = textService; _umbracoMapper = umbracoMapper; - _globalSettings = globalSettings.Value; - _securitySettings = securitySettings.Value; + _globalSettings = globalSettings.CurrentValue; + _securitySettings = securitySettings.CurrentValue; _logger = logger; _ipResolver = ipResolver; - _passwordConfiguration = passwordConfiguration.Value; + _passwordConfiguration = passwordConfiguration.CurrentValue; _emailSender = emailSender; _smsSender = smsSender; _hostingEnvironment = hostingEnvironment; _linkGenerator = linkGenerator; _externalAuthenticationOptions = externalAuthenticationOptions; _backOfficeTwoFactorOptions = backOfficeTwoFactorOptions; + } ///