Refactor ModularStartup to use HostingStartup

Author: mythz

api/MyApp/Configure.Auth.cs

@@ -1,8 +1,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using ServiceStack;
+using ServiceStack.Caching;
 using ServiceStack.Auth;
 using ServiceStack.FluentValidation;
 
+[assembly: HostingStartup(typeof(MyApp.ConfigureAuth))]
+
 namespace MyApp
 {
     // Add any additional metadata properties you want to store in the Users Typed Session
@@ -23,28 +26,30 @@ public CustomRegistrationValidator()
         }
     }
 
-    public class ConfigureAuth : IConfigureAppHost, IConfigureServices
+    public class ConfigureAuth : IHostingStartup
     {
-        public void Configure(IServiceCollection services)
-        {
-            //services.AddSingleton<ICacheClient>(new MemoryCacheClient()); //Store User Sessions in Memory Cache (default)
-        }
+        public void Configure(IWebHostBuilder builder) => builder
+            //.ConfigureServices(services => services.AddSingleton<ICacheClient>(new MemoryCacheClient()))
+            .ConfigureAppHost(appHost => { 
+                var appSettings = appHost.AppSettings;
+                appHost.Plugins.Add(new AuthFeature(() => new CustomUserSession(),
+                    new IAuthProvider[] {
+                        new JwtAuthProvider(appSettings) {
+                            RequireSecureConnection = !appHost.IsDevelopmentEnvironment(),
+                            AuthKey = AesUtils.CreateKey(),
+                            UseTokenCookie = true,
+                        },
+                        new CredentialsAuthProvider(appSettings), /* Sign In with Username / Password credentials */
+                        new FacebookAuthProvider(appSettings), /* Create App https://developers.facebook.com/apps */
+                        new GoogleAuthProvider(
+                            appSettings), /* Create App https://console.developers.google.com/apis/credentials */
+                        new MicrosoftGraphAuthProvider(appSettings), /* Create App https://apps.dev.microsoft.com */
+                    }));
 
-        public void Configure(IAppHost appHost)
-        {
-            var AppSettings = appHost.AppSettings;
-            appHost.Plugins.Add(new AuthFeature(() => new CustomUserSession(),
-                new IAuthProvider[] {
-                    new CredentialsAuthProvider(AppSettings),     /* Sign In with Username / Password credentials */
-                    new FacebookAuthProvider(AppSettings),        /* Create App https://developers.facebook.com/apps */
-                    new GoogleAuthProvider(AppSettings),          /* Create App https://console.developers.google.com/apis/credentials */
-                    new MicrosoftGraphAuthProvider(AppSettings),  /* Create App https://apps.dev.microsoft.com */
-                }));
+                appHost.Plugins.Add(new RegistrationFeature()); //Enable /register Service
 
-            appHost.Plugins.Add(new RegistrationFeature()); //Enable /register Service
-
-            //override the default registration validation with your own custom implementation
-            appHost.RegisterAs<CustomRegistrationValidator, IValidator<Register>>();
-        }
+                //override the default registration validation with your own custom implementation
+                appHost.RegisterAs<CustomRegistrationValidator, IValidator<Register>>();
+            });
     }
-}
+}

api/MyApp/Configure.AuthRepository.cs

@@ -1,12 +1,11 @@
 using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
 using ServiceStack;
 using ServiceStack.Web;
 using ServiceStack.Data;
 using ServiceStack.Auth;
 using ServiceStack.Configuration;
-using ServiceStack.OrmLite;
+
+[assembly: HostingStartup(typeof(MyApp.ConfigureAuthRepository))]
 
 namespace MyApp
 {
@@ -20,42 +19,35 @@ public class AppUser : UserAuth
 
     public class AppUserAuthEvents : AuthEvents
     {
-        public override void OnAuthenticated(IRequest req, IAuthSession session, IServiceBase authService, 
-            IAuthTokens tokens, Dictionary<string, string> authInfo)
+        public override async Task OnAuthenticatedAsync(IRequest httpReq, IAuthSession session, IServiceBase authService, 
+            IAuthTokens tokens, Dictionary<string, string> authInfo, CancellationToken token = default)
         {
-            var authRepo = HostContext.AppHost.GetAuthRepository(req);
+            var authRepo = HostContext.AppHost.GetAuthRepositoryAsync(httpReq);
             using (authRepo as IDisposable)
             {
-                var userAuth = (AppUser)authRepo.GetUserAuth(session.UserAuthId);
+                var userAuth = (AppUser)await authRepo.GetUserAuthAsync(session.UserAuthId, token);
                 userAuth.ProfileUrl = session.GetProfileUrl();
-                userAuth.LastLoginIp = req.UserHostAddress;
+                userAuth.LastLoginIp = httpReq.UserHostAddress;
                 userAuth.LastLoginDate = DateTime.UtcNow;
-                authRepo.SaveUserAuth(userAuth);
+                await authRepo.SaveUserAuthAsync(userAuth, token);
             }
         }
     }
 
-    public class ConfigureAuthRepository : IConfigureAppHost, IConfigureServices, IPreInitPlugin
+    public class ConfigureAuthRepository : IHostingStartup
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.AddSingleton<IAuthRepository>(c =>
+        public void Configure(IWebHostBuilder builder) => builder
+            .ConfigureServices(services => services.AddSingleton<IAuthRepository>(c =>
                 new OrmLiteAuthRepository<AppUser, UserAuthDetails>(c.Resolve<IDbConnectionFactory>()) {
                     UseDistinctRoleTables = true
-                });            
-        }
-
-        public void Configure(IAppHost appHost)
-        {
-            var authRepo = appHost.Resolve<IAuthRepository>();
-            authRepo.InitSchema();
-            CreateUser(authRepo, "admin@email.com", "Admin User", "p@55wOrd", roles:new[]{ RoleNames.Admin });
-        }
-
-        public void BeforePluginsLoaded(IAppHost appHost)
-        {
-            appHost.AssertPlugin<AuthFeature>().AuthEvents.Add(new AppUserAuthEvents());
-        }
+                }))
+            .ConfigureAppHost(appHost => {
+                var authRepo = appHost.Resolve<IAuthRepository>();
+                authRepo.InitSchema();
+                CreateUser(authRepo, "admin@email.com", "Admin User", "p@55wOrd", roles:new[]{ RoleNames.Admin });
+            }, afterConfigure: appHost => {
+                appHost.AssertPlugin<AuthFeature>().AuthEvents.Add(new AppUserAuthEvents());
+            });
 
         // Add initial Users to the configured Auth Repository
         public void CreateUser(IAuthRepository authRepo, string email, string name, string password, string[] roles)

api/MyApp/Configure.Db.cs

@@ -1,10 +1,9 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using ServiceStack;
 using ServiceStack.Data;
-using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite;
 
+[assembly: HostingStartup(typeof(MyApp.ConfigureDb))]
+
 namespace MyApp
 {
     // Example Data Model
@@ -15,29 +14,22 @@ namespace MyApp
     //     public string Name { get; set; }
     // }
 
-    public class ConfigureDb : IConfigureServices, IConfigureAppHost
+    public class ConfigureDb : IHostingStartup
     {
-        IConfiguration Configuration { get; }
-        public ConfigureDb(IConfiguration configuration) => Configuration = configuration;
-
-        public void Configure(IServiceCollection services)
-        {
-            services.AddSingleton<IDbConnectionFactory>(new OrmLiteConnectionFactory(
-                Configuration.GetConnectionString("DefaultConnection")
+        public void Configure(IWebHostBuilder builder) => builder
+            .ConfigureServices(services => services.AddSingleton<IDbConnectionFactory>(new OrmLiteConnectionFactory(
+                builder.GetSetting("ConnectionStrings:DefaultConnection")
                     ?? ":memory:",
-                SqliteDialect.Provider));
-        }
-
-        public void Configure(IAppHost appHost)
-        {
-            appHost.GetPlugin<SharpPagesFeature>()?.ScriptMethods.Add(new DbScriptsAsync());
+                SqliteDialect.Provider)))
+            .ConfigureAppHost(appHost => {
+                appHost.GetPlugin<SharpPagesFeature>()?.ScriptMethods.Add(new DbScriptsAsync());
 
-            // Create non-existing Table and add Seed Data Example
-            // using var db = appHost.Resolve<IDbConnectionFactory>().Open();
-            // if (db.CreateTableIfNotExists<MyTable>())
-            // {
-            //     db.Insert(new MyTable { Name = "Seed Data for new MyTable" });
-            // }
-        }
+                // Create non-existing Table and add Seed Data Example
+                // using var db = appHost.Resolve<IDbConnectionFactory>().Open();
+                // if (db.CreateTableIfNotExists<MyTable>())
+                // {
+                //     db.Insert(new MyTable { Name = "Seed Data for new MyTable" });
+                // }
+            });
     }
 }

api/MyApp/Program.cs

@@ -2,8 +2,6 @@
 using ServiceStack;
 
 var builder = WebApplication.CreateBuilder(args);
-
-builder.Services.AddModularStartup<AppHost>(builder.Configuration);
 builder.Services.ConfigureNonBreakingSameSiteCookies(builder.Environment);
 
 var app = builder.Build();