Bump OCC.Email.Hotmail to 1.6.0

Author: hishamco

src/OrchardCoreContrib.Email.Hotmail/AdminMenu.cs

@@ -1,42 +1,40 @@
-using Microsoft.Extensions.Localization;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 using OrchardCoreContrib.Email.Hotmail.Drivers;
+
+namespace OrchardCoreContrib.Email.Hotmail;
+
 using OrchardCoreContrib.Navigation;
 
-namespace OrchardCoreContrib.Email.Hotmail
+/// <summary>
+/// Represents an admin menu for Hotmail mailing module.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of <see cref="AdminMenu"/>.
+/// </remarks>
+/// <param name="stringLocalizer"></param>
+public class AdminMenu(IStringLocalizer<AdminMenu> S) : AdminNavigationProvider
 {
-    using OrchardCoreContrib.Navigation;
-
-    /// <summary>
-    /// Represents an admin menu for Hotmail mailing module.
-    /// </summary>
-    public class AdminMenu : AdminNavigationProvider
+    private static readonly RouteValueDictionary _routeValues = new()
     {
-        private readonly IStringLocalizer S;
+        { "area", "OrchardCore.Settings" },
+        { "groupId", HotmailSettingsDisplayDriver.GroupId },
+    };
 
-        /// <summary>
-        /// Initializes a new instance of <see cref="AdminMenu"/>.
-        /// </summary>
-        /// <param name="stringLocalizer"></param>
-        public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
-        {
-            S = stringLocalizer;
-        }
-
-        /// <inheritdoc/>
-        public override void BuildNavigation(NavigationBuilder builder)
-        {
-            builder
-                .Add(S["Configuration"], configuration => configuration
-                    .Add(S["Settings"], settings => settings
-                       .Add(S["Hotmail"], S["Hotmail"].PrefixPosition(), entry => entry
-                       .AddClass("hotmail").Id("hotmail")
-                          .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = HotmailSettingsDisplayDriver.GroupId })
-                          .Permission(Permissions.ManageHotmailSettings)
-                          .LocalNav()
-                        )
+    /// <inheritdoc/>
+    public override void BuildNavigation(NavigationBuilder builder)
+    {
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                   .Add(S["Hotmail"], S["Hotmail"].PrefixPosition(), entry => entry
+                   .AddClass("hotmail").Id("hotmail")
+                      .Action("Index", "Admin", _routeValues)
+                      .Permission(HotmailPermissions.ManageHotmailSettings)
+                      .LocalNav()
                     )
-                );
-        }
+                )
+            );
     }
 }

src/OrchardCoreContrib.Email.Hotmail/Controllers/AdminController.cs

@@ -5,98 +5,83 @@
 using OrchardCore.Email;
 using OrchardCoreContrib.Email.Hotmail.Drivers;
 using OrchardCoreContrib.Email.Hotmail.ViewModels;
-using System.Threading.Tasks;
 
-namespace OrchardCoreContrib.Email.Hotmail.Controllers
+namespace OrchardCoreContrib.Email.Hotmail.Controllers;
+
+public class AdminController(
+    IHtmlLocalizer<AdminController> H,
+    IAuthorizationService authorizationService,
+    INotifier notifier,
+    ISmtpService smtpService) : Controller
 {
-    public class AdminController : Controller
+    [HttpGet]
+    public async Task<IActionResult> Index()
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly INotifier _notifier;
-        private readonly ISmtpService _smtpService;
-        private readonly IHtmlLocalizer H;
-
-        public AdminController(
-            IHtmlLocalizer<AdminController> htmlLocalizer,
-            IAuthorizationService authorizationService,
-            INotifier notifier,
-            ISmtpService smtpService)
+        if (!await authorizationService.AuthorizeAsync(User, HotmailPermissions.ManageHotmailSettings))
         {
-            H = htmlLocalizer;
-            _authorizationService = authorizationService;
-            _notifier = notifier;
-            _smtpService = smtpService;
+            return Forbid();
         }
 
-        [HttpGet]
-        public async Task<IActionResult> Index()
-        {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageHotmailSettings))
-            {
-                return Forbid();
-            }
+        return View();
+    }
 
-            return View();
+    [HttpPost, ActionName(nameof(Index))]
+    public async Task<IActionResult> IndexPost(HotmailSettingsViewModel model)
+    {
+        if (!await authorizationService.AuthorizeAsync(User, HotmailPermissions.ManageHotmailSettings))
+        {
+            return Forbid();
         }
 
-        [HttpPost, ActionName(nameof(Index))]
-        public async Task<IActionResult> IndexPost(HotmailSettingsViewModel model)
+        if (ModelState.IsValid)
         {
-            if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageHotmailSettings))
-            {
-                return Forbid();
-            }
-
-            if (ModelState.IsValid)
-            {
-                var message = CreateMessageFromViewModel(model);
+            var message = CreateMessageFromViewModel(model);
 
-                var result = await _smtpService.SendAsync(message);
+            var result = await smtpService.SendAsync(message);
 
-                if (!result.Succeeded)
-                {
-                    foreach (var error in result.Errors)
-                    {
-                        ModelState.AddModelError("*", error.ToString());
-                    }
-                }
-                else
+            if (!result.Succeeded)
+            {
+                foreach (var error in result.Errors)
                 {
-                    await _notifier.SuccessAsync(H["Message sent successfully"]);
-
-                    return Redirect(Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = HotmailSettingsDisplayDriver.GroupId }));
+                    ModelState.AddModelError("*", error.ToString());
                 }
             }
+            else
+            {
+                await notifier.SuccessAsync(H["Message sent successfully"]);
 
-            return View(model);
+                return Redirect(Url.Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = HotmailSettingsDisplayDriver.GroupId }));
+            }
         }
 
-        private MailMessage CreateMessageFromViewModel(HotmailSettingsViewModel testSettings)
-        {
-            var message = new MailMessage
-            {
-                To = testSettings.To,
-                Bcc = testSettings.Bcc,
-                Cc = testSettings.Cc,
-                ReplyTo = testSettings.ReplyTo
-            };
+        return View(model);
+    }
 
-            if (!string.IsNullOrWhiteSpace(testSettings.Sender))
-            {
-                message.Sender = testSettings.Sender;
-            }
+    private MailMessage CreateMessageFromViewModel(HotmailSettingsViewModel testSettings)
+    {
+        var message = new MailMessage
+        {
+            To = testSettings.To,
+            Bcc = testSettings.Bcc,
+            Cc = testSettings.Cc,
+            ReplyTo = testSettings.ReplyTo
+        };
 
-            if (!string.IsNullOrWhiteSpace(testSettings.Subject))
-            {
-                message.Subject = testSettings.Subject;
-            }
+        if (!string.IsNullOrWhiteSpace(testSettings.Sender))
+        {
+            message.Sender = testSettings.Sender;
+        }
 
-            if (!string.IsNullOrWhiteSpace(testSettings.Body))
-            {
-                message.Body = testSettings.Body;
-            }
+        if (!string.IsNullOrWhiteSpace(testSettings.Subject))
+        {
+            message.Subject = testSettings.Subject;
+        }
 
-            return message;
+        if (!string.IsNullOrWhiteSpace(testSettings.Body))
+        {
+            message.Body = testSettings.Body;
         }
+
+        return message;
     }
 }