Upgrade to v8.1

mythz · mythz · commit 1d9cd1d01b0b · 2024-02-06T18:02:27.000+08:00
diff --git a/MyApp.ServiceInterface/EmailServices.cs b/MyApp.ServiceInterface/EmailServices.cs
@@ -48,7 +48,9 @@ public class SmtpConfig
 /// <summary>
 /// Uses a configured SMTP client to send emails
 /// </summary>
-public class EmailServices(SmtpConfig config, ILogger<EmailServices> log) : Service
+public class EmailServices(SmtpConfig config, ILogger<EmailServices> log) 
+    // TODO: Uncomment to enable sending emails with SMTP
+    // : Service
 {
     public object Any(SendEmail request)
     {
diff --git a/MyApp.ServiceModel/Hello.cs b/MyApp.ServiceModel/Hello.cs
@@ -2,14 +2,13 @@
 
 namespace MyApp.ServiceModel;
 
-[Route("/hello")]
 [Route("/hello/{Name}")]
-public class Hello : IReturn<HelloResponse>
+public class Hello : IGet, IReturn<HelloResponse>
 {
-    public string? Name { get; set; }
+    public required string Name { get; set; }
 }
 
 public class HelloResponse
 {
-    public string Result { get; set; } = default!;
+    public required string Result { get; set; }
 }
diff --git a/MyApp/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/MyApp/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
@@ -28,15 +28,15 @@ public class ExternalLoginModel : PageModel
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly IUserStore<ApplicationUser> _userStore;
         private readonly IUserEmailStore<ApplicationUser> _emailStore;
-        private readonly IEmailSender _emailSender;
+        private readonly IEmailSender<ApplicationUser> _emailSender;
         private readonly ILogger<ExternalLoginModel> _logger;
 
         public ExternalLoginModel(
             SignInManager<ApplicationUser> signInManager,
             UserManager<ApplicationUser> userManager,
             IUserStore<ApplicationUser> userStore,
             ILogger<ExternalLoginModel> logger,
-            IEmailSender emailSender)
+            IEmailSender<ApplicationUser> emailSender)
         {
             _signInManager = signInManager;
             _userManager = userManager;
@@ -172,10 +172,9 @@ public async Task<IActionResult> OnPostConfirmationAsync(string returnUrl = null
                             "/Account/ConfirmEmail",
                             pageHandler: null,
                             values: new { area = "Identity", userId = userId, code = code },
-                            protocol: Request.Scheme);
+                            protocol: Request.Scheme)!;
 
-                        await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
-                            $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+                        await _emailSender.SendConfirmationLinkAsync(user, Input.Email, callbackUrl);
 
                         // If account confirmation is required, we need to show the link if we don't have a real email sender
                         if (_userManager.Options.SignIn.RequireConfirmedAccount)
diff --git a/MyApp/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/MyApp/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
@@ -20,9 +20,9 @@ namespace MyApp.Areas.Identity.Pages.Account
     public class ForgotPasswordModel : PageModel
     {
         private readonly UserManager<ApplicationUser> _userManager;
-        private readonly IEmailSender _emailSender;
+        private readonly IEmailSender<ApplicationUser> _emailSender;
 
-        public ForgotPasswordModel(UserManager<ApplicationUser> userManager, IEmailSender emailSender)
+        public ForgotPasswordModel(UserManager<ApplicationUser> userManager, IEmailSender<ApplicationUser> emailSender)
         {
             _userManager = userManager;
             _emailSender = emailSender;
@@ -69,12 +69,11 @@ public async Task<IActionResult> OnPostAsync()
                     "/Account/ResetPassword",
                     pageHandler: null,
                     values: new { area = "Identity", code },
-                    protocol: Request.Scheme);
+                    protocol: Request.Scheme)!;
 
-                await _emailSender.SendEmailAsync(
+                await _emailSender.SendPasswordResetLinkAsync(user,
                     Input.Email,
-                    "Reset Password",
-                    $"Please reset your password by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+                    callbackUrl);
 
                 return RedirectToPage("./ForgotPasswordConfirmation");
             }
diff --git a/MyApp/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs b/MyApp/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs
@@ -20,12 +20,12 @@ public class EmailModel : PageModel
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
-        private readonly IEmailSender _emailSender;
+        private readonly IEmailSender<ApplicationUser> _emailSender;
 
         public EmailModel(
             UserManager<ApplicationUser> userManager,
             SignInManager<ApplicationUser> signInManager,
-            IEmailSender emailSender)
+            IEmailSender<ApplicationUser> emailSender)
         {
             _userManager = userManager;
             _signInManager = signInManager;
@@ -123,11 +123,10 @@ public async Task<IActionResult> OnPostChangeEmailAsync()
                     "/Account/ConfirmEmailChange",
                     pageHandler: null,
                     values: new { area = "Identity", userId = userId, email = Input.NewEmail, code = code },
-                    protocol: Request.Scheme);
-                await _emailSender.SendEmailAsync(
+                    protocol: Request.Scheme)!;
+                await _emailSender.SendConfirmationLinkAsync(user,
                     Input.NewEmail,
-                    "Confirm your email",
-                    $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+                    callbackUrl);
 
                 StatusMessage = "Confirmation link to change email sent. Please check your email.";
                 return RedirectToPage();
@@ -159,11 +158,10 @@ public async Task<IActionResult> OnPostSendVerificationEmailAsync()
                 "/Account/ConfirmEmail",
                 pageHandler: null,
                 values: new { area = "Identity", userId = userId, code = code },
-                protocol: Request.Scheme);
-            await _emailSender.SendEmailAsync(
-                email,
-                "Confirm your email",
-                $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+                protocol: Request.Scheme)!;
+            await _emailSender.SendConfirmationLinkAsync(user,
+                email!,
+                callbackUrl);
 
             StatusMessage = "Verification email sent. Please check your email.";
             return RedirectToPage();
diff --git a/MyApp/Areas/Identity/Pages/Account/Register.cshtml.cs b/MyApp/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -29,14 +29,14 @@ public class RegisterModel : PageModel
         private readonly IUserStore<ApplicationUser> _userStore;
         private readonly IUserEmailStore<ApplicationUser> _emailStore;
         private readonly ILogger<RegisterModel> _logger;
-        private readonly IEmailSender _emailSender;
+        private readonly IEmailSender<ApplicationUser> _emailSender;
 
         public RegisterModel(
             UserManager<ApplicationUser> userManager,
             IUserStore<ApplicationUser> userStore,
             SignInManager<ApplicationUser> signInManager,
             ILogger<RegisterModel> logger,
-            IEmailSender emailSender)
+            IEmailSender<ApplicationUser> emailSender)
         {
             _userManager = userManager;
             _userStore = userStore;
@@ -130,10 +130,11 @@ public async Task<IActionResult> OnPostAsync(string returnUrl = null)
                         "/Account/ConfirmEmail",
                         pageHandler: null,
                         values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },
-                        protocol: Request.Scheme);
+                        protocol: Request.Scheme)!;
 
-                    await _emailSender.SendEmailAsync(Input.Email, "Confirm your email",
-                        $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+                    await _emailSender.SendConfirmationLinkAsync(user,
+                        Input.Email,
+                        callbackUrl);
 
                     if (_userManager.Options.SignIn.RequireConfirmedAccount)
                     {
diff --git a/MyApp/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs b/MyApp/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs
@@ -19,9 +19,9 @@ namespace MyApp.Areas.Identity.Pages.Account
     public class RegisterConfirmationModel : PageModel
     {
         private readonly UserManager<ApplicationUser> _userManager;
-        private readonly IEmailSender _sender;
+        private readonly IEmailSender<ApplicationUser> _sender;
 
-        public RegisterConfirmationModel(UserManager<ApplicationUser> userManager, IEmailSender sender)
+        public RegisterConfirmationModel(UserManager<ApplicationUser> userManager, IEmailSender<ApplicationUser> sender)
         {
             _userManager = userManager;
             _sender = sender;
diff --git a/MyApp/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs b/MyApp/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs
@@ -21,9 +21,9 @@ namespace MyApp.Areas.Identity.Pages.Account
     public class ResendEmailConfirmationModel : PageModel
     {
         private readonly UserManager<ApplicationUser> _userManager;
-        private readonly IEmailSender _emailSender;
+        private readonly IEmailSender<ApplicationUser> _emailSender;
 
-        public ResendEmailConfirmationModel(UserManager<ApplicationUser> userManager, IEmailSender emailSender)
+        public ResendEmailConfirmationModel(UserManager<ApplicationUser> userManager, IEmailSender<ApplicationUser> emailSender)
         {
             _userManager = userManager;
             _emailSender = emailSender;
@@ -76,11 +76,10 @@ public async Task<IActionResult> OnPostAsync()
                 "/Account/ConfirmEmail",
                 pageHandler: null,
                 values: new { userId = userId, code = code },
-                protocol: Request.Scheme);
-            await _emailSender.SendEmailAsync(
+                protocol: Request.Scheme)!;
+            await _emailSender.SendConfirmationLinkAsync(user,
                 Input.Email,
-                "Confirm your email",
-                $"Please confirm your account by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+                callbackUrl);
 
             ModelState.AddModelError(string.Empty, "Verification email sent. Please check your email.");
             return Page();
diff --git a/MyApp/Configure.AppHost.cs b/MyApp/Configure.AppHost.cs
@@ -1,22 +1,16 @@
-﻿using Funq;
-using ServiceStack;
-using MyApp.ServiceInterface;
-
-[assembly: HostingStartup(typeof(MyApp.AppHost))]
+﻿[assembly: HostingStartup(typeof(MyApp.AppHost))]
 
 namespace MyApp;
 
-public class AppHost : AppHostBase, IHostingStartup
+public class AppHost() : AppHostBase("MyApp"), IHostingStartup
 {
     public void Configure(IWebHostBuilder builder) => builder
         .ConfigureServices((context,services) => {
             // Configure ASP.NET Core IOC Dependencies
         });
 
-    public AppHost() : base("MyApp", typeof(MyServices).Assembly) { }
-
     // Configure your AppHost with the necessary configuration and dependencies your App needs
-    public override void Configure(Container container)
+    public override void Configure()
     {
         SetConfig(new HostConfig {
         });
diff --git a/MyApp/Configure.Auth.cs b/MyApp/Configure.Auth.cs
@@ -1,10 +1,4 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Identity;
-using ServiceStack;
 using ServiceStack.Auth;
-using MyApp.Data;
-using ServiceStack.Configuration;
-using ServiceStack.Text;
 
 [assembly: HostingStartup(typeof(MyApp.ConfigureAuth))]
 
@@ -19,8 +13,9 @@ public void Configure(IWebHostBuilder builder) => builder
         .ConfigureAppHost(appHost => 
         {
             appHost.Plugins.Add(new AuthFeature(IdentityAuth.For<ApplicationUser>(options => {
-                options.EnableCredentialsAuth = true;
                 options.SessionFactory = () => new CustomUserSession();
+                options.CredentialsAuth();
+                options.AdminUsersFeature();
             })));
         });
 }
diff --git a/MyApp/Configure.AutoQuery.cs b/MyApp/Configure.AutoQuery.cs
@@ -11,17 +11,19 @@ public void Configure(IWebHostBuilder builder) => builder
         .ConfigureServices(services => {
             // Enable Audit History
             services.AddSingleton<ICrudEvents>(c =>
-                new OrmLiteCrudEvents(c.Resolve<IDbConnectionFactory>()));
-        })
-        .ConfigureAppHost(appHost => {
+                new OrmLiteCrudEvents(c.GetRequiredService<IDbConnectionFactory>()));
+
+            // For TodosService
+            services.AddPlugin(new AutoQueryDataFeature());
 
             // For Bookings https://docs.servicestack.net/autoquery-crud-bookings
-            appHost.Plugins.Add(new AutoQueryFeature
+            services.AddPlugin(new AutoQueryFeature
             {
                 MaxLimit = 1000,
                 //IncludeTotal = true,
             });
-
+        })
+        .ConfigureAppHost(appHost => {
             appHost.Resolve<ICrudEvents>().InitSchema();
         });
 }
diff --git a/MyApp/Configure.Db.cs b/MyApp/Configure.Db.cs
@@ -1,4 +1,3 @@
-using ServiceStack;
 using ServiceStack.Data;
 using ServiceStack.OrmLite;
 
@@ -14,9 +13,8 @@ public void Configure(IWebHostBuilder builder) => builder
                 context.Configuration.GetConnectionString("DefaultConnection")
                 ?? ":memory:",
                 SqliteDialect.Provider));
-        })
-        .ConfigureAppHost(appHost => {
+
             // Enable built-in Database Admin UI at /admin-ui/database
-            appHost.Plugins.Add(new AdminDatabaseFeature());
+            services.AddPlugin(new AdminDatabaseFeature());
         });
-}
+}
diff --git a/MyApp/Configure.Mq.cs b/MyApp/Configure.Mq.cs
@@ -1,8 +1,10 @@
-using System.Text.Encodings.Web;
-using ServiceStack;
 using ServiceStack.Messaging;
-using MyApp.Data;
 using MyApp.ServiceInterface;
+using MyApp.ServiceModel;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.UI.Services;
+using MyApp.Data;
+using ServiceStack;
 
 [assembly: HostingStartup(typeof(MyApp.ConfigureMq))]
 
@@ -24,34 +26,33 @@ public void Configure(IWebHostBuilder builder) => builder
             services.AddSingleton<IMessageService>(c => new BackgroundMqService());
         })
         .ConfigureAppHost(afterAppHostInit: appHost => {
-            appHost.Resolve<IMessageService>().Start();
             var mqService = appHost.Resolve<IMessageService>();
 
             //Register ServiceStack APIs you want to be able to invoke via MQ
             mqService.RegisterHandler<SendEmail>(appHost.ExecuteMessage);
+            mqService.Start();
         });
 }
 
-// This class is used by the application to send email for account confirmation and password reset.
-// For more details see https://go.microsoft.com/fwlink/?LinkID=532713
-public interface IEmailSender
+// Remove the "else if (EmailSender is IdentityNoOpEmailSender)" block from RegisterConfirmation.razor after updating with a real implementation.
+internal sealed class IdentityNoOpEmailSender : IEmailSender<ApplicationUser>
 {
-    Task SendEmailAsync(string email, string subject, string message);
-}
+    private readonly IEmailSender emailSender = new NoOpEmailSender();
 
-public static class EmailSenderExtensions
-{
-    public static Task SendEmailConfirmationAsync(this IEmailSender emailSender, string email, string link)
-    {
-        return emailSender.SendEmailAsync(email, "Confirm your email",
-            $"Please confirm your account by clicking this link: <a href='{HtmlEncoder.Default.Encode(link)}'>link</a>");
-    }
+    public Task SendConfirmationLinkAsync(ApplicationUser user, string email, string confirmationLink) =>
+        emailSender.SendEmailAsync(email, "Confirm your email", $"Please confirm your account by <a href='{confirmationLink}'>clicking here</a>.");
+
+    public Task SendPasswordResetLinkAsync(ApplicationUser user, string email, string resetLink) =>
+        emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password by <a href='{resetLink}'>clicking here</a>.");
+
+    public Task SendPasswordResetCodeAsync(ApplicationUser user, string email, string resetCode) =>
+        emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password using the following code: {resetCode}");
 }
 
 /// <summary>
 /// Sends emails by publishing a message to the Background MQ Server where it's processed in the background
 /// </summary>
-public class EmailSender(IMessageService messageService) : IEmailSender
+public class EmailSender(IMessageService messageService) : IEmailSender<ApplicationUser>
 {
     public Task SendEmailAsync(string email, string subject, string htmlMessage)
     {
@@ -65,5 +66,13 @@ public Task SendEmailAsync(string email, string subject, string htmlMessage)
 
         return Task.CompletedTask;
     }
-}
 
+    public Task SendConfirmationLinkAsync(ApplicationUser user, string email, string confirmationLink) =>
+        SendEmailAsync(email, "Confirm your email", $"Please confirm your account by <a href='{confirmationLink}'>clicking here</a>.");
+
+    public Task SendPasswordResetLinkAsync(ApplicationUser user, string email, string resetLink) =>
+        SendEmailAsync(email, "Reset your password", $"Please reset your password by <a href='{resetLink}'>clicking here</a>.");
+
+    public Task SendPasswordResetCodeAsync(ApplicationUser user, string email, string resetCode) =>
+        SendEmailAsync(email, "Reset your password", $"Please reset your password using the following code: {resetCode}");
+}
diff --git a/MyApp/MyApp.csproj b/MyApp/MyApp.csproj
@@ -19,9 +19,11 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.*" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.*" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.*" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.*" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.*" />
+        <PackageReference Include="Markdig" Version="0.34.*" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.*" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.*" />
         <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.*" />
     </ItemGroup>
 
@@ -31,6 +33,7 @@
         <PackageReference Include="ServiceStack.Server" Version="8.*" />
         <PackageReference Include="ServiceStack.Extensions" Version="8.*" />
         <PackageReference Include="ServiceStack.OrmLite.Sqlite.Data" Version="8.*" />
+        <PackageReference Include="ServiceStack.AspNetCore.OpenApi" Version="8.*" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MyApp/Program.cs b/MyApp/Program.cs
diff --git a/MyApp/wwwroot/lib/mjs/servicestack-client.min.mjs b/MyApp/wwwroot/lib/mjs/servicestack-client.min.mjs
diff --git a/MyApp/wwwroot/lib/mjs/servicestack-client.mjs b/MyApp/wwwroot/lib/mjs/servicestack-client.mjs
diff --git a/MyApp/wwwroot/lib/mjs/vue.min.mjs b/MyApp/wwwroot/lib/mjs/vue.min.mjs
diff --git a/MyApp/wwwroot/lib/mjs/vue.mjs b/MyApp/wwwroot/lib/mjs/vue.mjs
diff --git a/MyApp/wwwroot/mjs/app.mjs b/MyApp/wwwroot/mjs/app.mjs
diff --git a/MyApp/wwwroot/mjs/dtos.mjs b/MyApp/wwwroot/mjs/dtos.mjs

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ public class SmtpConfig`
`48`	`48`	`/// <summary>`
`49`	`49`	`/// Uses a configured SMTP client to send emails`
`50`	`50`	`/// </summary>`
`51`		`-public class EmailServices(SmtpConfig config, ILogger<EmailServices> log) : Service`
	`51`	`+public class EmailServices(SmtpConfig config, ILogger<EmailServices> log)`
	`52`	`+ // TODO: Uncomment to enable sending emails with SMTP`
	`53`	`+ // : Service`
`52`	`54`	`{`
`53`	`55`	`public object Any(SendEmail request)`
`54`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,13 @@`
`2`	`2`
`3`	`3`	`namespace MyApp.ServiceModel;`
`4`	`4`
`5`		`-[Route("/hello")]`
`6`	`5`	`[Route("/hello/{Name}")]`
`7`		`-public class Hello : IReturn<HelloResponse>`
	`6`	`+public class Hello : IGet, IReturn<HelloResponse>`
`8`	`7`	`{`
`9`		`- public string? Name { get; set; }`
	`8`	`+ public required string Name { get; set; }`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`public class HelloResponse`
`13`	`12`	`{`
`14`		`- public string Result { get; set; } = default!;`
	`13`	`+ public required string Result { get; set; }`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ namespace MyApp.Areas.Identity.Pages.Account`
`19`	`19`	`public class RegisterConfirmationModel : PageModel`
`20`	`20`	`{`
`21`	`21`	`private readonly UserManager<ApplicationUser> _userManager;`
`22`		`- private readonly IEmailSender _sender;`
	`22`	`+ private readonly IEmailSender<ApplicationUser> _sender;`
`23`	`23`
`24`		`- public RegisterConfirmationModel(UserManager<ApplicationUser> userManager, IEmailSender sender)`
	`24`	`+ public RegisterConfirmationModel(UserManager<ApplicationUser> userManager, IEmailSender<ApplicationUser> sender)`
`25`	`25`	`{`
`26`	`26`	`_userManager = userManager;`
`27`	`27`	`_sender = sender;`