Added configuration from json file

src/Skoruba.IdentityServer4.Admin.Api/Configuration/AdminApiConfiguration.cs

@@ -1,13 +1,17 @@
-using Skoruba.IdentityServer4.Admin.Api.Configuration.Constants;
-
-namespace Skoruba.IdentityServer4.Admin.Api.Configuration
+namespace Skoruba.IdentityServer4.Admin.Api.Configuration
 {
     public class AdminApiConfiguration
     {
-        public string IdentityServerBaseUrl { get; set; } = AuthorizationConsts.IdentityServerBaseUrl;
+        public string ApiName { get; set; }
+
+        public string ApiVersion { get; set; }
+
+        public string IdentityServerBaseUrl { get; set; }
+
+        public string OidcSwaggerUIClientId { get; set; }
 
-        public string OidcSwaggerUIClientId { get; set; } = AuthorizationConsts.OidcSwaggerUIClientId;
+        public string OidcApiName { get; set; }
 
-        public string OidcApiName { get; set; } = AuthorizationConsts.OidcApiName;
+        public string AdministrationRole { get; set; }
     }
 }

src/Skoruba.IdentityServer4.Admin.Api/Configuration/Constants/AuthorizationConsts.cs

@@ -2,11 +2,6 @@
 {
     public class AuthorizationConsts
     {
-        public const string IdentityServerBaseUrl = "http://localhost:5000";
-        public const string OidcSwaggerUIClientId = "skoruba_identity_admin_api_swaggerui";
-        public const string OidcApiName = "skoruba_identity_admin_api";
-
         public const string AdministrationPolicy = "RequireAdministratorRole";
-        public const string AdministrationRole = "SkorubaIdentityAdminAdministrator";
     }
 }

src/Skoruba.IdentityServer4.Admin.Api/Helpers/StartupHelpers.cs

@@ -150,10 +150,12 @@ public static void AddApiAuthentication<TIdentityDbContext, TUser, TRole>(this I
 
         public static void AddAuthorizationPolicies(this IServiceCollection services)
         {
+            var adminApiConfiguration = services.BuildServiceProvider().GetService<AdminApiConfiguration>();
+
             services.AddAuthorization(options =>
             {
                 options.AddPolicy(AuthorizationConsts.AdministrationPolicy,
-                    policy => policy.RequireRole(AuthorizationConsts.AdministrationRole));
+                    policy => policy.RequireRole(adminApiConfiguration.AdministrationRole));
             });
         }
     }

src/Skoruba.IdentityServer4.Admin.Api/Startup.cs

@@ -75,14 +75,14 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddSwaggerGen(options =>
             {
-                options.SwaggerDoc(ApiConfigurationConsts.ApiVersionV1, new Info { Title = ApiConfigurationConsts.ApiName, Version = ApiConfigurationConsts.ApiVersionV1 });
+                options.SwaggerDoc(adminApiConfiguration.ApiVersion, new Info { Title = adminApiConfiguration.ApiName, Version = adminApiConfiguration.ApiVersion });
 
                 options.AddSecurityDefinition("oauth2", new OAuth2Scheme
                 {
                     Flow = "implicit",
                     AuthorizationUrl = $"{adminApiConfiguration.IdentityServerBaseUrl}/connect/authorize",
                     Scopes = new Dictionary<string, string> {
-                        { adminApiConfiguration.OidcApiName, ApiConfigurationConsts.ApiName }
+                        { adminApiConfiguration.OidcApiName, adminApiConfiguration.ApiName }
                     }
                 });
 
@@ -102,10 +102,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, AdminApi
             app.UseSwagger();
             app.UseSwaggerUI(c =>
             {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", ApiConfigurationConsts.ApiName);
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", adminApiConfiguration.ApiName);
 
                 c.OAuthClientId(adminApiConfiguration.OidcSwaggerUIClientId);
-                c.OAuthAppName(ApiConfigurationConsts.ApiName);
+                c.OAuthAppName(adminApiConfiguration.ApiName);
             });
 
             app.UseMvc();

src/Skoruba.IdentityServer4.Admin.Api/appsettings.json

@@ -6,8 +6,11 @@
         "AdminLogDbConnection": "Server=(localdb)\\mssqllocaldb;Database=IdentityServer4Admin;Trusted_Connection=True;MultipleActiveResultSets=true"
     },
     "AdminApiConfiguration": {
+        "ApiName": "Skoruba IdentityServer4 Admin Api",
+        "ApiVersion": "v1",
         "IdentityServerBaseUrl": "http://localhost:5000",
         "OidcSwaggerUIClientId": "skoruba_identity_admin_api_swaggerui",
-        "OidcApiName": "skoruba_identity_admin_api"
+        "OidcApiName": "skoruba_identity_admin_api",
+        "AdministrationRole": "SkorubaIdentityAdminAdministrator"
     }
 }

src/Skoruba.IdentityServer4.Admin/Configuration/AdminConfiguration.cs

@@ -1,24 +1,20 @@
-using Skoruba.IdentityServer4.Admin.Configuration.Constants;
-using Skoruba.IdentityServer4.Admin.Configuration.Interfaces;
+using Skoruba.IdentityServer4.Admin.Configuration.Interfaces;
 
 namespace Skoruba.IdentityServer4.Admin.Configuration
 {
     public class AdminConfiguration : IAdminConfiguration
     {
-        public string IdentityAdminBaseUrl { get; set; } = "http://localhost:9000";
-        public string IdentityAdminRedirectUri { get; set; } = "http://localhost:9000/signin-oidc";
-
-        public string IdentityServerBaseUrl { get; set; } = "http://localhost:5000";
-        public string ClientId { get; set; } = AuthenticationConsts.OidcClientId;
+        public string IdentityAdminRedirectUri { get; set; }
         public string[] Scopes { get; set; }
-
-        public string IdentityAdminApiSwaggerUIClientId { get; } = AuthenticationConsts.IdentityAdminApiSwaggerClientId;
-        public string IdentityAdminApiSwaggerUIRedirectUrl { get; } = "http://localhost:5001/swagger/oauth2-redirect.html";
-        public string IdentityAdminApiScope { get; } = AuthenticationConsts.IdentityAdminApiScope;
-
-        public string ClientSecret { get; set; } = AuthenticationConsts.OidcClientSecret;
-        public string OidcResponseType { get; set; } = AuthenticationConsts.OidcResponseType;
-
-
+        public string AdministrationRole { get; set; }
+        public bool RequireHttpsMetadata { get; set; }
+        public string IdentityAdminCookieName { get; set; }
+        public double IdentityAdminCookieExpiresUtcHours { get; set; }
+        public string TokenValidationClaimName { get; set; }
+        public string TokenValidationClaimRole { get; set; }
+        public string IdentityServerBaseUrl { get; set; }
+        public string ClientId { get; set; } 
+        public string ClientSecret { get; set; }
+        public string OidcResponseType { get; set; }
     }
 }

src/Skoruba.IdentityServer4.Admin/Configuration/Constants/AuthenticationConsts.cs

@@ -1,29 +1,9 @@
-using System.Collections.Generic;
-
-namespace Skoruba.IdentityServer4.Admin.Configuration.Constants
+namespace Skoruba.IdentityServer4.Admin.Configuration.Constants
 {
     public class AuthenticationConsts
     {
-        public const string IdentityAdminCookieName = "IdentityServerAdmin";
-        public const string UserNameClaimType = "name";
         public const string SignInScheme = "Cookies";
-        public const string OidcClientId = "skoruba_identity_admin";
-        public const string OidcClientSecret = "skoruba_admin_client_secret";
         public const string OidcAuthenticationScheme = "oidc";
-        public const string OidcResponseType = "code id_token";
-        public static List<string> Scopes = new List<string> { ScopeOpenId, ScopeProfile, ScopeEmail, ScopeRoles };
-
-        public const string IdentityAdminApiSwaggerClientId = "skoruba_identity_admin_api_swaggerui";
-        public const string IdentityAdminApiScope = "skoruba_identity_admin_api";
-
-        public const string ScopeOpenId = "openid";
-        public const string ScopeProfile = "profile";
-        public const string ScopeEmail = "email";
-        public const string ScopeRoles = "roles";
-
-        public const string RoleClaim = "role";
-
         public const string AccountLoginPage = "Account/Login";
-        public const string AccountAccessDeniedPage = "/Account/AccessDenied/";
     }
 }

src/Skoruba.IdentityServer4.Admin/Configuration/Constants/AuthorizationConsts.cs

@@ -3,6 +3,5 @@
     public class AuthorizationConsts
     {
         public const string AdministrationPolicy = "RequireAdministratorRole";
-        public const string AdministrationRole = "SkorubaIdentityAdminAdministrator";
     }
 }

src/Skoruba.IdentityServer4.Admin/Configuration/Constants/ConfigurationConsts.cs

@@ -15,5 +15,9 @@ public class ConfigurationConsts
         public const string ResourcesPath = "Resources";
 
         public const string AdminConfigurationKey = "AdminConfiguration";
+
+        public const string IdentityServerDataConfigurationKey = "IdentityServerData";
+
+        public const string IdentityDataConfigurationKey = "IdentityData";
     }
 }

src/Skoruba.IdentityServer4.Admin/Configuration/Identity/Claim.cs

@@ -0,0 +1,8 @@
+namespace Skoruba.IdentityServer4.Admin.Configuration.Identity
+{
+    public class Claim
+    {
+        public string Type { get; set; }
+        public string Value { get; set; }
+    }
+}

src/Skoruba.IdentityServer4.Admin/Configuration/Identity/Role.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Skoruba.IdentityServer4.Admin.Configuration.Identity
+{
+    public class Role
+    {
+        public string Name { get; set; }
+        public List<Claim> Claims { get; set; } = new List<Claim>();
+    }
+}

src/Skoruba.IdentityServer4.Admin/Configuration/Identity/User.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Skoruba.IdentityServer4.Admin.Configuration.Identity
+{
+    public class User
+    {
+        public string Username { get; set; }
+        public string Email { get; set; }
+        public string Password { get; set; }
+        public List<Claim> Claims { get; set; } = new List<Claim>();
+        public List<string> Roles { get; set; } = new List<string>();
+    }
+}

src/Skoruba.IdentityServer4.Admin/Configuration/IdentityDataConfiguration.cs

@@ -0,0 +1,12 @@
+using Skoruba.IdentityServer4.Admin.Configuration.Identity;
+using Skoruba.IdentityServer4.Admin.Configuration.Interfaces;
+using System.Collections.Generic;
+
+namespace Skoruba.IdentityServer4.Admin.Configuration
+{
+    public class IdentityDataConfiguration : IIdentityDataConfiguration
+    {
+       public List<Role> Roles { get; set; }
+       public List<User> Users { get; set; }
+    }
+}

src/Skoruba.IdentityServer4.Admin/Configuration/IdentityServer/Client.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Skoruba.IdentityServer4.Admin.Configuration.Identity;
+
+namespace Skoruba.IdentityServer4.Admin.Configuration.IdentityServer
+{
+    public class Client : global::IdentityServer4.Models.Client
+    {
+        public List<Claim> ClientClaims { get; set; } = new List<Claim>();
+    }
+}

src/Skoruba.IdentityServer4.Admin/Configuration/IdentityServerDataConfiguration.cs

@@ -0,0 +1,14 @@
+using IdentityServer4.Models;
+using Skoruba.IdentityServer4.Admin.Configuration.Interfaces;
+using System.Collections.Generic;
+using Client = Skoruba.IdentityServer4.Admin.Configuration.IdentityServer.Client;
+
+namespace Skoruba.IdentityServer4.Admin.Configuration
+{
+    public class IdentityServerDataConfiguration : IIdentityServerDataConfiguration
+    {
+        public List<Client> Clients { get; set; } = new List<Client>();
+        public List<IdentityResource> IdentityResources { get; set; } = new List<IdentityResource>();
+        public List<ApiResource> ApiResources { get; set; } = new List<ApiResource>();
+    }
+}