Upgrade mix ModularStartup configuration to use .NET HostingStartup

ServiceStack · Nov 11, 2021 · b567466 · b567466
1 parent 6053acc
commit b567466
Show file tree

Hide file tree

Showing 44 changed files with 608 additions and 694 deletions.
diff --git a/assets/nuglify/Configure.Nuglify.cs b/assets/nuglify/Configure.Nuglify.cs
@@ -2,6 +2,8 @@
 using ServiceStack.Html;
 using NUglify;
 
+[assembly: HostingStartup(typeof(MyApp.ConfigureNUglify))]
+
 namespace MyApp
 {
     public class NUglifyJsMinifier : ICompressor
@@ -17,13 +19,13 @@ public class NUglifyHtmlMinifier : ICompressor
         public string Compress(string html) => Uglify.Html(html).Code;
     }
 
-    public class ConfigureNUglify : IConfigureAppHost
+    public class ConfigureNUglify : IHostingStartup
     {
-        public void Configure(IAppHost appHost)
-        {
-            Minifiers.JavaScript = new NUglifyJsMinifier();
-            Minifiers.Css = new NUglifyCssMinifier();
-            Minifiers.Html = new NUglifyHtmlMinifier();
-        }
+        public void Configure(IWebHostBuilder builder) => builder
+            .ConfigureAppHost(_ => {
+                Minifiers.JavaScript = new NUglifyJsMinifier();
+                Minifiers.Css = new NUglifyCssMinifier();
+                Minifiers.Html = new NUglifyHtmlMinifier();
+            });
     }
-}
+}
diff --git a/auth/auth-ext/Configure.Auth.cs b/auth/auth-ext/Configure.Auth.cs
@@ -3,14 +3,16 @@
 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
     public class CustomUserSession : AuthUserSession
     {
     }
 
-    // Custom Validator to add custom validators to built-in /register Service requiring DisplayName and ConfirmPassword
+// Custom Validator to add custom validators to built-in /register Service requiring DisplayName and ConfirmPassword
     public class CustomRegistrationValidator : RegistrationValidator
     {
         public CustomRegistrationValidator()
@@ -23,29 +25,27 @@ 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()); //Store User Sessions in Memory Cache (default)
+            })
+            .ConfigureAppHost(appHost => {
+                var appSettings = appHost.AppSettings;
+                appHost.Plugins.Add(new AuthFeature(() => new CustomUserSession(),
+                    new IAuthProvider[] {
+                        new CredentialsAuthProvider(appSettings),     /* Sign In with Username / Password credentials */
+                        new AppleAuthProvider(appSettings),           /* Configure: https://developer.okta.com/blog/2019/06/04/what-the-heck-is-sign-in-with-apple */
+                        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 AppleAuthProvider(AppSettings),           /* Configure: https://developer.okta.com/blog/2019/06/04/what-the-heck-is-sign-in-with-apple */
-                    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>>();
+            });
     }
-}
+}
diff --git a/auth/auth/Configure.Auth.cs b/auth/auth/Configure.Auth.cs
@@ -3,14 +3,16 @@
 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
     public class CustomUserSession : AuthUserSession
     {
     }
 
-    // Custom Validator to add custom validators to built-in /register Service requiring DisplayName and ConfirmPassword
+// Custom Validator to add custom validators to built-in /register Service requiring DisplayName and ConfirmPassword
     public class CustomRegistrationValidator : RegistrationValidator
     {
         public CustomRegistrationValidator()
@@ -23,28 +25,26 @@ 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()); //Store User Sessions in Memory Cache (default)
+            })
+            .ConfigureAppHost(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 */
+                    }));
 
-        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>>();
+            });
     }
-}
+}
diff --git a/auth/db/Configure.AuthRepository.cs b/auth/db/Configure.AuthRepository.cs
@@ -1,12 +1,10 @@
-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
 {
@@ -35,27 +33,19 @@ public override void OnAuthenticated(IRequest req, IAuthSession session, IServic
         }
     }
 
-    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)

diff --git a/auth/dynamodb/Configure.AuthRepository.cs b/auth/dynamodb/Configure.AuthRepository.cs
@@ -1,16 +1,14 @@
-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.Aws;
-using ServiceStack.Aws.DynamoDb;
+
+[assembly: HostingStartup(typeof(MyApp.ConfigureAuthRepository))]
 
 namespace MyApp
 {
-    // Custom UserAuth Data Model with extended Metadata properties
+    // Custom User Table with extended Metadata properties
     public class AppUser : UserAuth
     {
         public string ProfileUrl { get; set; }
@@ -35,26 +33,17 @@ public override void OnAuthenticated(IRequest req, IAuthSession session, IServic
         }
     }
 
-    public class ConfigureAuthRepository : IConfigureAppHost, IConfigureServices, IPreInitPlugin
+    public class ConfigureAuthRepository : IHostingStartup
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.AddSingleton<IAuthRepository>(c =>
-                new DynamoDbAuthRepository<AppUser, UserAuthDetails>(c.Resolve<IPocoDynamo>()));
-        }
-
-        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());
-        }
+        public void Configure(IWebHostBuilder builder) => builder
+            .ConfigureServices(services => services.AddSingleton<IAuthRepository>(c =>
+                new DynamoDbAuthRepository<AppUser, UserAuthDetails>(c.Resolve<IPocoDynamo>())))
+            .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)

diff --git a/auth/marten/Configure.AuthRepository.cs b/auth/marten/Configure.AuthRepository.cs
@@ -8,9 +8,11 @@
 using Marten;
 using ServiceStack.Authentication.Marten;
 
+[assembly: HostingStartup(typeof(MyApp.ConfigureAuthRepository))]
+
 namespace MyApp
 {
-    // Custom UserAuth Data Model with extended Metadata properties
+    // Custom User Table with extended Metadata properties
     public class AppUser : UserAuth
     {
         public string ProfileUrl { get; set; }
@@ -35,7 +37,7 @@ public override void OnAuthenticated(IRequest req, IAuthSession session, IServic
         }
     }
 
-    public class ConfigureAuthRepository : IConfigureAppHost, IConfigureServices, IPreInitPlugin
+    public class ConfigureAuthRepository : IHostingStartup
     {
         static ConfigureAuthRepository()
         {
@@ -46,24 +48,15 @@ static ConfigureAuthRepository()
             });
         }
 
-        public void Configure(IServiceCollection services)
-        {
-            services.AddSingleton<IAuthRepository>(c =>
-                new MartenAuthRepository<AppUser, UserAuthDetails>(c.Resolve<IDocumentStore>()));
-        }
-
-        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());
-        }
+        public void Configure(IWebHostBuilder builder) => builder
+            .ConfigureServices(services => services.AddSingleton<IAuthRepository>(c =>
+                new MartenAuthRepository<AppUser, UserAuthDetails>(c.Resolve<IDocumentStore>())))
+            .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)

diff --git a/auth/memory/Configure.AuthRepository.cs b/auth/memory/Configure.AuthRepository.cs
@@ -1,14 +1,13 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
 using ServiceStack;
 using ServiceStack.Web;
 using ServiceStack.Auth;
 using ServiceStack.Configuration;
 
+[assembly: HostingStartup(typeof(MyApp.ConfigureAuthRepository))]
+
 namespace MyApp
 {
-    // Custom UserAuth Data Model with extended Metadata properties
+    // Custom User Table with extended Metadata properties
     public class AppUser : UserAuth
     {
         public string ProfileUrl { get; set; }
@@ -33,26 +32,17 @@ public override void OnAuthenticated(IRequest req, IAuthSession session, IServic
         }
     }
 
-    public class ConfigureAuthRepository : IConfigureAppHost, IConfigureServices, IPreInitPlugin
+    public class ConfigureAuthRepository : IHostingStartup
     {
-        public void Configure(IServiceCollection services)
-        {
-            services.AddSingleton<IAuthRepository>(c =>
-                new InMemoryAuthRepository<AppUser, UserAuthDetails>());
-        }
-
-        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());
-        }
+        public void Configure(IWebHostBuilder builder) => builder
+            .ConfigureServices(services => services.AddSingleton<IAuthRepository>(c =>
+                new InMemoryAuthRepository<AppUser, UserAuthDetails>()))
+            .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)