Revised EventHubUrlOptions

src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs

@@ -112,7 +112,7 @@ namespace EventHub.Admin
         private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddAbpSwaggerGenWithOAuth(
-                configuration[EventHubUrlOptions.GetAccountConfigKey()],
+                EventHubUrlOptions.GetAccountConfigValue(configuration),
                 new Dictionary<string, string>
                 {
                     {"EventHubAdmin", "EventHub Admin API"}
@@ -151,7 +151,7 @@ namespace EventHub.Admin
                 {
                     builder
                         .WithOrigins(
-                            configuration[EventHubUrlOptions.GetAdminConfigKey()]
+                            EventHubUrlOptions.GetAdminConfigValue(configuration)
                         )
                         .WithAbpExposedHeaders()
                         .SetIsOriginAllowedToAllowWildcardSubdomains()

src/EventHub.Domain.Shared/Web/EventHubUrlOptions.cs

@@ -1,49 +1,65 @@
-namespace EventHub.Web
+using Microsoft.Extensions.Configuration;
+
+namespace EventHub.Web
 {
     public class EventHubUrlOptions
     {
         private const string ConfigurationName = "AppUrls";
+        private const string AccountDefaultValue = "https://localhost:44313";
+        private const string AdminDefaultValue = "https://localhost:44307";
+        private const string WwwDefaultValue = "https://localhost:44308";
+        private const string ApiDefaultValue = "https://localhost:44362";
+        private const string ApiInternalDefaultValue = ApiDefaultValue;
+        private const string AdminApiDefaultValue = "https://localhost:44305";
 
-        public string Account { get; set; } = "https://localhost:44313";
-        public string Www { get; set; } = "https://localhost:44308";
-        public string Api { get; set; } = "https://localhost:44362";
-        public string ApiInternal { get; set; } = "https://localhost:44362";
-        public string Admin { get; set; } = "https://localhost:44307";
-        public string AdminApi { get; set; } = "https://localhost:44305";
+        public string Account { get; set; } = AccountDefaultValue;
+        public string Www { get; set; } = WwwDefaultValue;
+        public string Api { get; set; } = ApiDefaultValue;
+        public string ApiInternal { get; set; } = ApiInternalDefaultValue;
+        public string Admin { get; set; } = AdminDefaultValue;
+        public string AdminApi { get; set; } = AdminApiDefaultValue;
 
-        public static string GetAccountConfigKey()
+        public static string GetAccountConfigValue(IConfiguration configuration)
         {
-            return GetConfigKey(nameof(Account));
+            return GetConfigValue(configuration, nameof(Account), AccountDefaultValue);
         }
         
-        public static string GetWwwConfigKey()
+        public static string GetWwwConfigValue(IConfiguration configuration)
         {
-            return GetConfigKey(nameof(Www));
+            return GetConfigValue(configuration, nameof(Www), WwwDefaultValue);
         }
         
-        public static string GetApiInternalConfigKey()
+        public static string GetApiInternalConfigValue(IConfiguration configuration)
         {
-            return GetConfigKey(nameof(ApiInternal));
+            return GetConfigValue(configuration, nameof(ApiInternal), ApiInternalDefaultValue);
         }
-        
-        public static string GetApiConfigKey()
+
+        public static string GetApiConfigValue(IConfiguration configuration)
         {
-            return GetConfigKey(nameof(Api));
+            return GetConfigValue(configuration, nameof(Api), ApiDefaultValue);
         }
         
-        public static string GetAdminConfigKey()
+        public static string GetAdminConfigValue(IConfiguration configuration)
         {
-            return GetConfigKey(nameof(Admin));
+            return GetConfigValue(configuration, nameof(Admin), AdminDefaultValue);
         }
-        
-        public static string GetAdminApiConfigKey()
+
+        public static string GetAdminApiConfigValue(IConfiguration configuration)
         {
-            return GetConfigKey(nameof(AdminApi));
+            return GetConfigValue(configuration, nameof(AdminApi), AdminApiDefaultValue);
         }
-        
+
         private static string GetConfigKey(string appName)
         {
             return $"{ConfigurationName}:{appName}";
         }
+        
+        private static string GetConfigValue(
+            IConfiguration configuration,
+            string appName,
+            string defaultValue)
+        {
+            return configuration[GetConfigKey(appName)] ?? defaultValue;
+        }
     }
 }

src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs

@@ -114,7 +114,7 @@ namespace EventHub
         private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration)
         {
             context.Services.AddAbpSwaggerGenWithOAuth(
-                configuration[EventHubUrlOptions.GetAccountConfigKey()],
+                EventHubUrlOptions.GetAccountConfigValue(configuration),
                 new Dictionary<string, string>
                 {
                     {"EventHub", "EventHub API"}
@@ -153,7 +153,7 @@ namespace EventHub
                 {
                     builder
                         .WithOrigins(
-                            configuration[EventHubUrlOptions.GetWwwConfigKey()]
+                            EventHubUrlOptions.GetWwwConfigValue(configuration)
                         )
                         .WithAbpExposedHeaders()
                         .SetIsOriginAllowedToAllowWildcardSubdomains()

src/EventHub.IdentityServer/EventHubIdentityServerModule.cs

@@ -118,7 +118,7 @@ namespace EventHub
 
             Configure<IdentityServerOptions>(options =>
             {
-                options.IssuerUri = configuration[EventHubUrlOptions.GetAccountConfigKey()];
+                options.IssuerUri = EventHubUrlOptions.GetAccountConfigValue(configuration);
             });
 
             if (hostingEnvironment.IsDevelopment())
@@ -133,14 +133,13 @@ namespace EventHub
 
             Configure<AppUrlOptions>(options =>
             {
-                options.Applications["MVC"].RootUrl = configuration[EventHubUrlOptions.GetAccountConfigKey()];
+                options.Applications["MVC"].RootUrl = EventHubUrlOptions.GetAccountConfigValue(configuration);
                 options.RedirectAllowedUrls.AddRange(
                     new[]
                     {
-                        configuration[EventHubUrlOptions.GetWwwConfigKey()],
-                        configuration[EventHubUrlOptions.GetAdminConfigKey()],
-                        configuration[EventHubUrlOptions.GetApiConfigKey()],
-                        configuration[EventHubUrlOptions.GetAdminApiConfigKey()]
+                        EventHubUrlOptions.GetWwwConfigValue(configuration),
+                        EventHubUrlOptions.GetApiConfigValue(configuration),
+                        EventHubUrlOptions.GetAdminApiConfigValue(configuration)
                     });
             });
 
@@ -165,10 +164,10 @@ namespace EventHub
                 {
                     builder
                         .WithOrigins(
-                            configuration[EventHubUrlOptions.GetWwwConfigKey()],
-                            configuration[EventHubUrlOptions.GetApiConfigKey()],
-                            configuration[EventHubUrlOptions.GetAdminConfigKey()],
-                            configuration[EventHubUrlOptions.GetAdminApiConfigKey()]
+                            EventHubUrlOptions.GetWwwConfigValue(configuration),
+                            EventHubUrlOptions.GetApiConfigValue(configuration),
+                            EventHubUrlOptions.GetAdminConfigValue(configuration),
+                            EventHubUrlOptions.GetAdminApiConfigValue(configuration)
                         )
                         .WithAbpExposedHeaders()
                         .SetIsOriginAllowedToAllowWildcardSubdomains()
@@ -191,7 +190,7 @@ namespace EventHub
             {
                 if (ctx.Request.Headers.ContainsKey("from-ingress"))
                 {
-                    ctx.SetIdentityServerOrigin(configuration[EventHubUrlOptions.GetAccountConfigKey()]);
+                    ctx.SetIdentityServerOrigin(EventHubUrlOptions.GetAccountConfigValue(configuration));
                 }
                 
                 await next();

src/EventHub.Web/EventHubWebModule.cs

@@ -112,13 +112,13 @@ namespace EventHub.Web
         {
             Configure<AppUrlOptions>(options =>
             {
-                options.Applications["MVC"].RootUrl = configuration[EventHubUrlOptions.GetWwwConfigKey()];
+                options.Applications["MVC"].RootUrl = EventHubUrlOptions.GetWwwConfigValue(configuration);
             });
             
             Configure<AbpRemoteServiceOptions>(options =>
             {
                 options.RemoteServices.Default = new RemoteServiceConfiguration(
-                    configuration[EventHubUrlOptions.GetApiInternalConfigKey()]
+                    EventHubUrlOptions.GetApiInternalConfigValue(configuration)
                         .EnsureEndsWith('/')
                     );
             });

src/EventHub.Web/Menus/EventHubMenuContributor.cs

@@ -51,7 +51,7 @@ namespace EventHub.Web.Menus
             if (currentUser.IsAuthenticated)
             {
                 context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["ManageYourProfile"],
-                    $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration[EventHubUrlOptions.GetWwwConfigKey()]}", icon: "fa fa-cog", order: 1000, null, "_blank"));
+                    $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={EventHubUrlOptions.GetWwwConfigValue(_configuration)}", icon: "fa fa-cog", order: 1000, null, "_blank"));
                 context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
             }