Add a way to queue releasing shell context from setting display drivers

src/OrchardCore.Modules/OrchardCore.Email.Azure/Drivers/AzureEmailSettingsDisplayDriver.cs

@@ -15,7 +15,7 @@
 using OrchardCore.Email.Core;
 using OrchardCore.Email.Services;
 using OrchardCore.Entities;
-using OrchardCore.Environment.Shell;
+using OrchardCore.Infrastructure;
 using OrchardCore.Modules;
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Settings;
@@ -27,8 +27,6 @@ public class AzureEmailSettingsDisplayDriver : SectionDisplayDriver<ISite, Azure
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly IAuthorizationService _authorizationService;
     private readonly IDataProtectionProvider _dataProtectionProvider;
-    private readonly IShellHost _shellHost;
-    private readonly ShellSettings _shellSettings;
     private readonly IEmailAddressValidator _emailValidator;
 
     protected IStringLocalizer S;
@@ -37,16 +35,12 @@ public AzureEmailSettingsDisplayDriver(
         IHttpContextAccessor httpContextAccessor,
         IAuthorizationService authorizationService,
         IDataProtectionProvider dataProtectionProvider,
-        IShellHost shellHost,
-        ShellSettings shellSettings,
         IEmailAddressValidator emailValidator,
         IStringLocalizer<AzureEmailSettingsDisplayDriver> stringLocalizer)
     {
         _httpContextAccessor = httpContextAccessor;
         _authorizationService = authorizationService;
         _dataProtectionProvider = dataProtectionProvider;
-        _shellHost = shellHost;
-        _shellSettings = shellSettings;
         _emailValidator = emailValidator;
         S = stringLocalizer;
     }
@@ -150,8 +144,8 @@ public override async Task<IDisplayResult> UpdateAsync(ISite site, AzureEmailSet
 
             if (hasChanges)
             {
-                // Release the tenant to apply the settings when something changed.
-                await _shellHost.ReleaseShellContextAsync(_shellSettings);
+                // Queue reloading shell context when something changed.
+                _httpContextAccessor.HttpContext.SignalReleaseShellContext();
             }
         }
 

src/OrchardCore.Modules/OrchardCore.Email.Smtp/Drivers/SmtpSettingsDisplayDriver.cs

@@ -13,7 +13,7 @@
 using OrchardCore.Email.Smtp.Services;
 using OrchardCore.Email.Smtp.ViewModels;
 using OrchardCore.Entities;
-using OrchardCore.Environment.Shell;
+using OrchardCore.Infrastructure;
 using OrchardCore.Modules;
 using OrchardCore.Mvc.ModelBinding;
 using OrchardCore.Settings;
@@ -26,8 +26,6 @@ public class SmtpSettingsDisplayDriver : SectionDisplayDriver<ISite, SmtpSetting
     public const string GroupId = EmailSettings.GroupId;
 
     private readonly IDataProtectionProvider _dataProtectionProvider;
-    private readonly IShellHost _shellHost;
-    private readonly ShellSettings _shellSettings;
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly SmtpOptions _smtpOptions;
     private readonly IAuthorizationService _authorizationService;
@@ -37,17 +35,13 @@ public class SmtpSettingsDisplayDriver : SectionDisplayDriver<ISite, SmtpSetting
 
     public SmtpSettingsDisplayDriver(
         IDataProtectionProvider dataProtectionProvider,
-        IShellHost shellHost,
-        ShellSettings shellSettings,
         IHttpContextAccessor httpContextAccessor,
         IOptions<SmtpOptions> options,
         IAuthorizationService authorizationService,
         IEmailAddressValidator emailAddressValidator,
         IStringLocalizer<SmtpSettingsDisplayDriver> stringLocalizer)
     {
         _dataProtectionProvider = dataProtectionProvider;
-        _shellHost = shellHost;
-        _shellSettings = shellSettings;
         _httpContextAccessor = httpContextAccessor;
         _smtpOptions = options.Value;
         _authorizationService = authorizationService;
@@ -200,8 +194,8 @@ public override async Task<IDisplayResult> UpdateAsync(ISite site, SmtpSettings
 
             if (hasChanges)
             {
-                // Release the tenant to apply the settings when something changed.
-                await _shellHost.ReleaseShellContextAsync(_shellSettings);
+                // Queue reloading shell context when something changed.
+                _httpContextAccessor.HttpContext.SignalReleaseShellContext();
             }
         }
 

src/OrchardCore.Modules/OrchardCore.Email/Drivers/EmailSettingsDisplayDriver.cs

@@ -8,11 +8,13 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.DisplayManagement.Entities;
 using OrchardCore.DisplayManagement.Handlers;
+using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Email.Core;
 using OrchardCore.Email.Core.Services;
 using OrchardCore.Email.ViewModels;
 using OrchardCore.Environment.Shell;
+using OrchardCore.Infrastructure;
 using OrchardCore.Modules;
 using OrchardCore.Settings;
 
@@ -71,7 +73,7 @@ public override async Task<IDisplayResult> EditAsync(EmailSettings settings, Bui
         .OnGroup(EmailSettings.GroupId);
     }
 
-    public override async Task<IDisplayResult> UpdateAsync(EmailSettings settings, UpdateEditorContext context)
+    public override async Task<IDisplayResult> UpdateAsync(EmailSettings settings, IUpdateModel updater, UpdateEditorContext context)
     {
         if (!context.GroupId.EqualsOrdinalIgnoreCase(EmailSettings.GroupId))
         {
@@ -91,7 +93,7 @@ public override async Task<IDisplayResult> UpdateAsync(EmailSettings settings, U
         {
             settings.DefaultProviderName = model.DefaultProvider;
 
-            await _shellHost.ReleaseShellContextAsync(_shellSettings);
+            _httpContextAccessor.HttpContext.SignalReleaseShellContext();
         }
 
         return await EditAsync(settings, context);

src/OrchardCore.Modules/OrchardCore.Facebook/Drivers/FacebookSettingsDisplayDriver.cs

@@ -6,10 +6,11 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.DisplayManagement.Entities;
 using OrchardCore.DisplayManagement.Handlers;
+using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
-using OrchardCore.Environment.Shell;
 using OrchardCore.Facebook.Settings;
 using OrchardCore.Facebook.ViewModels;
+using OrchardCore.Infrastructure;
 using OrchardCore.Settings;
 
 namespace OrchardCore.Facebook.Drivers
@@ -19,24 +20,18 @@ public class FacebookSettingsDisplayDriver : SectionDisplayDriver<ISite, Faceboo
         private readonly IAuthorizationService _authorizationService;
         private readonly IDataProtectionProvider _dataProtectionProvider;
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
         private readonly ILogger _logger;
 
         public FacebookSettingsDisplayDriver(
             IAuthorizationService authorizationService,
             IDataProtectionProvider dataProtectionProvider,
             IHttpContextAccessor httpContextAccessor,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
             ILogger<FacebookSettingsDisplayDriver> logger
             )
         {
             _authorizationService = authorizationService;
             _dataProtectionProvider = dataProtectionProvider;
             _httpContextAccessor = httpContextAccessor;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
             _logger = logger;
         }
 
@@ -73,7 +68,7 @@ public override async Task<IDisplayResult> EditAsync(FacebookSettings settings,
             }).Location("Content:0").OnGroup(FacebookConstants.Features.Core);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(FacebookSettings settings, UpdateEditorContext context)
+        public override async Task<IDisplayResult> UpdateAsync(FacebookSettings settings, IUpdateModel updater, UpdateEditorContext context)
         {
             if (context.GroupId == FacebookConstants.Features.Core)
             {
@@ -87,19 +82,23 @@ public override async Task<IDisplayResult> UpdateAsync(FacebookSettings settings
                 var model = new FacebookSettingsViewModel();
                 await context.Updater.TryUpdateModelAsync(model, Prefix);
 
+                settings.AppId = model.AppId;
+                settings.FBInit = model.FBInit;
+                settings.SdkJs = model.SdkJs;
+                settings.Version = model.Version;
+
+                if (!string.IsNullOrWhiteSpace(model.FBInitParams))
+                {
+                    settings.FBInitParams = model.FBInitParams;
+                }
+
                 if (context.Updater.ModelState.IsValid)
                 {
                     var protector = _dataProtectionProvider.CreateProtector(FacebookConstants.Features.Core);
-                    settings.AppId = model.AppId;
                     settings.AppSecret = protector.Protect(model.AppSecret);
-                    settings.FBInit = model.FBInit;
-                    settings.SdkJs = model.SdkJs;
-                    if (!string.IsNullOrWhiteSpace(model.FBInitParams))
-                        settings.FBInitParams = model.FBInitParams;
-                    settings.Version = model.Version;
-
-                    await _shellHost.ReleaseShellContextAsync(_shellSettings);
                 }
+
+                _httpContextAccessor.HttpContext.SignalReleaseShellContext();
             }
 
             return await EditAsync(settings, context);

src/OrchardCore.Modules/OrchardCore.Facebook/Login/Drivers/FacebookLoginSettingsDisplayDriver.cs

@@ -3,10 +3,11 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.DisplayManagement.Entities;
 using OrchardCore.DisplayManagement.Handlers;
+using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
-using OrchardCore.Environment.Shell;
 using OrchardCore.Facebook.Login.Settings;
 using OrchardCore.Facebook.Login.ViewModels;
+using OrchardCore.Infrastructure;
 using OrchardCore.Settings;
 
 namespace OrchardCore.Facebook.Login.Drivers
@@ -15,19 +16,13 @@ public class FacebookLoginSettingsDisplayDriver : SectionDisplayDriver<ISite, Fa
     {
         private readonly IAuthorizationService _authorizationService;
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
 
         public FacebookLoginSettingsDisplayDriver(
             IAuthorizationService authorizationService,
-            IHttpContextAccessor httpContextAccessor,
-            IShellHost shellHost,
-            ShellSettings shellSettings)
+            IHttpContextAccessor httpContextAccessor)
         {
             _authorizationService = authorizationService;
             _httpContextAccessor = httpContextAccessor;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
         }
 
         public override async Task<IDisplayResult> EditAsync(FacebookLoginSettings settings, BuildEditorContext context)
@@ -45,7 +40,7 @@ public override async Task<IDisplayResult> EditAsync(FacebookLoginSettings setti
             }).Location("Content:5").OnGroup(FacebookConstants.Features.Login);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(FacebookLoginSettings settings, UpdateEditorContext context)
+        public override async Task<IDisplayResult> UpdateAsync(FacebookLoginSettings settings, IUpdateModel updater, UpdateEditorContext context)
         {
             if (context.GroupId == FacebookConstants.Features.Login)
             {
@@ -56,15 +51,15 @@ public override async Task<IDisplayResult> UpdateAsync(FacebookLoginSettings set
                 }
 
                 var model = new FacebookLoginSettingsViewModel();
+
                 await context.Updater.TryUpdateModelAsync(model, Prefix);
 
-                if (context.Updater.ModelState.IsValid)
-                {
-                    settings.CallbackPath = model.CallbackPath;
-                    settings.SaveTokens = model.SaveTokens;
-                    await _shellHost.ReleaseShellContextAsync(_shellSettings);
-                }
+                settings.CallbackPath = model.CallbackPath;
+                settings.SaveTokens = model.SaveTokens;
+
+                _httpContextAccessor.HttpContext.SignalReleaseShellContext();
             }
+
             return await EditAsync(settings, context);
         }
     }

src/OrchardCore.Modules/OrchardCore.GitHub/Drivers/GithubAuthenticationSettingsDisplayDriver.cs

@@ -6,10 +6,11 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.DisplayManagement.Entities;
 using OrchardCore.DisplayManagement.Handlers;
+using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
-using OrchardCore.Environment.Shell;
 using OrchardCore.GitHub.Settings;
 using OrchardCore.GitHub.ViewModels;
+using OrchardCore.Infrastructure;
 using OrchardCore.Settings;
 
 namespace OrchardCore.GitHub.Drivers
@@ -19,23 +20,17 @@ public class GitHubAuthenticationSettingsDisplayDriver : SectionDisplayDriver<IS
         private readonly IAuthorizationService _authorizationService;
         private readonly IDataProtectionProvider _dataProtectionProvider;
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
         private readonly ILogger _logger;
 
         public GitHubAuthenticationSettingsDisplayDriver(
             IAuthorizationService authorizationService,
             IDataProtectionProvider dataProtectionProvider,
             IHttpContextAccessor httpContextAccessor,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
             ILogger<GitHubAuthenticationSettingsDisplayDriver> logger)
         {
             _authorizationService = authorizationService;
             _dataProtectionProvider = dataProtectionProvider;
             _httpContextAccessor = httpContextAccessor;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
             _logger = logger;
         }
 
@@ -76,7 +71,7 @@ public override async Task<IDisplayResult> EditAsync(GitHubAuthenticationSetting
             }).Location("Content:5").OnGroup(GitHubConstants.Features.GitHubAuthentication);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(GitHubAuthenticationSettings settings, UpdateEditorContext context)
+        public override async Task<IDisplayResult> UpdateAsync(GitHubAuthenticationSettings settings, IUpdateModel updater, UpdateEditorContext context)
         {
             if (context.GroupId == GitHubConstants.Features.GitHubAuthentication)
             {
@@ -97,9 +92,11 @@ public override async Task<IDisplayResult> UpdateAsync(GitHubAuthenticationSetti
                     settings.ClientSecret = protector.Protect(model.ClientSecret);
                     settings.CallbackPath = model.CallbackUrl;
                     settings.SaveTokens = model.SaveTokens;
-                    await _shellHost.ReleaseShellContextAsync(_shellSettings);
+
+                    _httpContextAccessor.HttpContext.SignalReleaseShellContext();
                 }
             }
+
             return await EditAsync(settings, context);
         }
     }

src/OrchardCore.Modules/OrchardCore.Google/Authentication/Drivers/GoogleAuthenticationSettingsDisplayDriver.cs

@@ -6,10 +6,11 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.DisplayManagement.Entities;
 using OrchardCore.DisplayManagement.Handlers;
+using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
-using OrchardCore.Environment.Shell;
 using OrchardCore.Google.Authentication.Settings;
 using OrchardCore.Google.Authentication.ViewModels;
+using OrchardCore.Infrastructure;
 using OrchardCore.Settings;
 
 namespace OrchardCore.Google.Authentication.Drivers
@@ -19,23 +20,17 @@ public class GoogleAuthenticationSettingsDisplayDriver : SectionDisplayDriver<IS
         private readonly IAuthorizationService _authorizationService;
         private readonly IDataProtectionProvider _dataProtectionProvider;
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IShellHost _shellHost;
-        private readonly ShellSettings _shellSettings;
         private readonly ILogger _logger;
 
         public GoogleAuthenticationSettingsDisplayDriver(
             IAuthorizationService authorizationService,
             IDataProtectionProvider dataProtectionProvider,
             IHttpContextAccessor httpContextAccessor,
-            IShellHost shellHost,
-            ShellSettings shellSettings,
             ILogger<GoogleAuthenticationSettingsDisplayDriver> logger)
         {
             _authorizationService = authorizationService;
             _dataProtectionProvider = dataProtectionProvider;
             _httpContextAccessor = httpContextAccessor;
-            _shellHost = shellHost;
-            _shellSettings = shellSettings;
             _logger = logger;
         }
 
@@ -76,7 +71,7 @@ public override async Task<IDisplayResult> EditAsync(GoogleAuthenticationSetting
             }).Location("Content:5").OnGroup(GoogleConstants.Features.GoogleAuthentication);
         }
 
-        public override async Task<IDisplayResult> UpdateAsync(GoogleAuthenticationSettings settings, UpdateEditorContext context)
+        public override async Task<IDisplayResult> UpdateAsync(ISite site, GoogleAuthenticationSettings settings, IUpdateModel updater, UpdateEditorContext context)
         {
             if (context.GroupId == GoogleConstants.Features.GoogleAuthentication)
             {
@@ -89,17 +84,20 @@ public override async Task<IDisplayResult> UpdateAsync(GoogleAuthenticationSetti
                 var model = new GoogleAuthenticationSettingsViewModel();
                 await context.Updater.TryUpdateModelAsync(model, Prefix);
 
+                settings.ClientID = model.ClientID;
+                settings.CallbackPath = model.CallbackPath;
+                settings.SaveTokens = model.SaveTokens;
+
                 if (context.Updater.ModelState.IsValid)
                 {
                     var protector = _dataProtectionProvider.CreateProtector(GoogleConstants.Features.GoogleAuthentication);
 
-                    settings.ClientID = model.ClientID;
                     settings.ClientSecret = protector.Protect(model.ClientSecret);
-                    settings.CallbackPath = model.CallbackPath;
-                    settings.SaveTokens = model.SaveTokens;
-                    await _shellHost.ReleaseShellContextAsync(_shellSettings);
                 }
+
+                _httpContextAccessor.HttpContext.SignalReleaseShellContext();
             }
+
             return await EditAsync(settings, context);
         }
     }