refactor and clean up code

Author: thangchung

samples/BiMonetaryApi/Controllers/TickerController.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NetCoreKit.Domain;

samples/BiMonetaryApi/appsettings.json

@@ -20,8 +20,29 @@
     "Enabled": true,
     "UI": {
       "Enabled": true
+    },
+    "ApiInfo": {
+      "Title": "BiMonetary API",
+      "Description": "An application with Swagger, Swashbuckle, and API versioning.",
+      "ContactName": "Vietnam Devs",
+      "ContactEmail": "[email protected]",
+      "TermOfService": "Shareware",
+      "LicenseName": "MIT",
+      "LicenseUrl": "https://github.com/cloudnative-netcore/netcorekit/blob/master/LICENSE"
     }
   },
+  "AuthN": {
+    "Enabled": true,
+    "ClaimToScopeMap": {
+      "access_example1_api": "example1_api_scope",
+      "access_example2_api": "example2_api_scope"
+    },
+    "Scopes": {
+      "example1_api_scope": "Example 1 APIs",
+      "example2_api_scope": "Example 2 APIs"
+    },
+    "Audience": "api"
+  }, 
   "Logging": {
     "LogLevel": {
       "Default": "Warning"

src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/ConfigurationExtensions.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
+using NetCoreKit.Infrastructure.AspNetCore.Miniservice.Options;
+
+namespace NetCoreKit.Infrastructure.AspNetCore.Miniservice
+{
+  public static class ConfigurationExtensions
+  {
+    public static Dictionary<string, string> GetScopes(this IConfiguration config)
+    {
+      return GetAuthNOptions(config).Scopes;
+    }
+
+    public static Dictionary<string, string> GetClaims(this IConfiguration config)
+    {
+      return GetAuthNOptions(config).ClaimToScopeMap;
+    }
+
+    public static string GetAudience(this IConfiguration config)
+    {
+      return GetAuthNOptions(config).Audience;
+    }
+
+    private static AuthNOptions GetAuthNOptions(IConfiguration config)
+    {
+      var options = new AuthNOptions();
+      config.GetSection("AuthN").Bind(options);
+      return options;
+    }
+  }
+}
+

src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Configurator.cs

@@ -2,8 +2,6 @@ namespace NetCoreKit.Infrastructure.AspNetCore.Miniservice
 {
   public sealed class Constants
   {
-    public const string ClaimToScopeMap = "claimToScopeMap";
-    public const string Scopes = "scopes";
-    public const string Audience = "audience";
+    
   }
 }

src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Constants.cs

@@ -20,7 +20,7 @@ public SysInfoController(IConfiguration config)
       _config = config;
     }
 
-    [HttpGet("/system-info")]
+    [HttpGet("/sysinfo")]
     public IActionResult Index()
     {
       // Source: http://michaco.net/blog/EnvironmentVariablesAndConfigurationInASPNETCoreApps

src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Controllers/SysInfoController.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
@@ -29,17 +28,13 @@ public static partial class ServiceCollectionExtensions
     public static IServiceCollection AddMongoMiniService(
       this IServiceCollection services,
       Action<IServiceCollection> preScopeAction = null,
-      Action<IServiceCollection, IServiceProvider> afterDbScopeAction = null,
-      Func<IEnumerable<KeyValuePair<string, object>>> extendServiceParamsFunc = null)
+      Action<IServiceCollection, IServiceProvider> afterDbScopeAction = null)
     {
-      services.AddScoped(sp => new ServiceParams().ExtendServiceParams(extendServiceParamsFunc?.Invoke()));
-
       using (var scope = services.BuildServiceProvider().GetService<IServiceScopeFactory>().CreateScope())
       {
         var svcProvider = scope.ServiceProvider;
         var config = svcProvider.GetRequiredService<IConfiguration>();
         var env = svcProvider.GetRequiredService<IHostingEnvironment>();
-        var serviceParams = svcProvider.GetRequiredService<ServiceParams>();
 
         // let registering the database providers or others from the outside
         preScopeAction?.Invoke(services);
@@ -127,12 +122,12 @@ public static IServiceCollection AddMongoMiniService(
             {
               options.Authority = GetAuthUri(config, env);
               options.RequireHttpsMetadata = false;
-              options.Audience = serviceParams.GetAudience();
+              options.Audience = config.GetAudience();
             });
 
           services.AddAuthorization(c =>
           {
-            foreach (var claimToScope in serviceParams.GetClaims())
+            foreach (var claimToScope in config.GetClaims())
               c.AddPolicy(claimToScope.Key, p => p.RequireClaim("scope", claimToScope.Value));
           });
         }
@@ -165,7 +160,7 @@ public static IServiceCollection AddMongoMiniService(
                 Flow = "implicit",
                 AuthorizationUrl = $"{GetExternalAuthUri(config)}/connect/authorize",
                 TokenUrl = $"{GetExternalAuthUri(config)}/connect/token",
-                Scopes = serviceParams.GetScopes()
+                Scopes = config.GetScopes()
               });
 
             c.EnableAnnotations();

src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Mongo.ServiceCollectionExtensions.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace NetCoreKit.Infrastructure.AspNetCore.Miniservice.Options
+{
+  public class AuthNOptions
+  {
+    public Dictionary<string, string> ClaimToScopeMap { get; set; }
+    public Dictionary<string, string> Scopes { get; set; }
+    public string Audience { get; set; }
+  }
+}