update files to publish

Author: brunobritodev

.gitignore

@@ -27,6 +27,9 @@ bld/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
+# Vs publish files
+*.pubxml
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*

src/Backend/Jp.Infra.CrossCutting.IdentityServer/Configuration/SigninCredentialExtension.cs

@@ -36,7 +36,6 @@ public static IIdentityServerBuilder AddSigninCredentialFromConfig(
             switch (keyType)
             {
                 case Temporary:
-                    logger.LogInformation($"SigninCredentialExtension adding Temporary Signing Credential");
                     builder.AddDeveloperSigningCredential(false);
                     break;
 
@@ -52,7 +51,7 @@ public static IIdentityServerBuilder AddSigninCredentialFromConfig(
                     AddCertificateFromEnvironment(builder, logger);
                     break;
             }
-
+            logger.LogInformation($"SigninCredentialExtension added");
             return builder;
         }
 

src/Backend/Jp.Infra.CrossCutting.Tools/DefaultConfig/JpProjectConfiguration.cs

@@ -16,9 +16,9 @@ public static class JpProjectConfiguration
                                                            .Build());
 
 
-        public static string IdentityServerUrl => $"{Environment.GetEnvironmentVariable("AUTHORITY") ?? Configuration.GetSection("ApplicationSettings").GetSection("Is4URL").Value}";
+        public static string IdentityServerUrl => $"{Environment.GetEnvironmentVariable("AUTHORITY") ?? Configuration.GetSection("ApplicationSettings").GetSection("Authority").Value}";
         public static string UserManagementUrl => $"{Environment.GetEnvironmentVariable("USER_MANAGEMENT_URI") ?? Configuration.GetSection("ApplicationSettings").GetSection("UserManagementURL").Value}";
-        public static string IdentityServerAdminUrl => $"{Environment.GetEnvironmentVariable("IS4_MANAGEMENT_URI") ?? Configuration.GetSection("ApplicationSettings").GetSection("Is4ManagementURL").Value}";
+        public static string IdentityServerAdminUrl => $"{Environment.GetEnvironmentVariable("IS4_ADMIN_UI") ?? Configuration.GetSection("ApplicationSettings").GetSection("IS4AdminUi").Value}";
         public static string ResourceServer => $"{Environment.GetEnvironmentVariable("RESOURCE_SERVER_URI") ?? Configuration.GetSection("ApplicationSettings").GetSection("ResourceServerURL").Value}";
 
         public static bool DatabaseType(string type)

src/Backend/Jp.Infra.Migrations.MySql.Identity/Configuration/IdentityConfig.cs

@@ -15,7 +15,7 @@ public static class IdentityConfig
     {
         public static IServiceCollection AddIdentityMySql(this IServiceCollection services, IConfiguration configuration)
         {
-            var connectionString = Environment.GetEnvironmentVariable("DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
+            var connectionString = Environment.GetEnvironmentVariable("CUSTOMCONNSTR_DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
             var migrationsAssembly = typeof(IdentityConfig).GetTypeInfo().Assembly.GetName().Name;
 
             var operationalStoreOptions = new OperationalStoreOptions();

src/Backend/Jp.Infra.Migrations.MySql.IdentityServer/Configuration/IdentityServerSqlConfig.cs

@@ -13,7 +13,7 @@ public static class IdentityServerSqlConfig
         public static IIdentityServerBuilder UseIdentityServerMySqlDatabase(this IIdentityServerBuilder builder,
             IServiceCollection services, IConfiguration configuration, ILogger logger)
         {
-            var connectionString = Environment.GetEnvironmentVariable("DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
+            var connectionString = Environment.GetEnvironmentVariable("CUSTOMCONNSTR_DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
             var migrationsAssembly = typeof(IdentityServerSqlConfig).GetTypeInfo().Assembly.GetName().Name;
 
             services.AddDbContext<JpContext>(options => options.UseMySql(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));
@@ -30,8 +30,8 @@ public static IIdentityServerBuilder UseIdentityServerMySqlDatabase(this IIdenti
                         b.UseMySql(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly));
 
                     // this enables automatic token cleanup. this is optional.
-                    options.EnableTokenCleanup = true;
-                    options.TokenCleanupInterval = 15; // frequency in seconds to cleanup stale grants. 15 is useful during debugging
+                    //options.EnableTokenCleanup = true;
+                    //options.TokenCleanupInterval = 15; // frequency in seconds to cleanup stale grants. 15 is useful during debugging
                 });
 
 

src/Backend/Jp.Infra.Migrations.Sql.Identity/Configuration/IdentityConfig.cs

@@ -15,7 +15,7 @@ public static class IdentityConfig
     {
         public static IServiceCollection AddIdentitySqlServer(this IServiceCollection services, IConfiguration configuration)
         {
-            var connectionString = Environment.GetEnvironmentVariable("DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
+            var connectionString = Environment.GetEnvironmentVariable("CUSTOMCONNSTR_DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
             var migrationsAssembly = typeof(IdentityConfig).GetTypeInfo().Assembly.GetName().Name;
 
             var operationalStoreOptions = new OperationalStoreOptions();

src/Backend/Jp.Infra.Migrations.Sql.IdentityServer/Configuration/IdentityServerSqlConfig.cs

@@ -13,7 +13,7 @@ public static class IdentityServerSqlConfig
         public static IIdentityServerBuilder UseIdentityServerSqlDatabase(this IIdentityServerBuilder builder,
             IServiceCollection services, IConfiguration configuration, ILogger logger)
         {
-            var connectionString = Environment.GetEnvironmentVariable("DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
+            var connectionString = Environment.GetEnvironmentVariable("CUSTOMCONNSTR_DATABASE_CONNECTION") ?? configuration.GetConnectionString("SSOConnection");
             var migrationsAssembly = typeof(IdentityServerSqlConfig).GetTypeInfo().Assembly.GetName().Name;
 
             services.AddDbContext<JpContext>(options => options.UseSqlServer(connectionString, sql => sql.MigrationsAssembly(migrationsAssembly)));

src/Backend/Jp.UserManagement/Configuration/ConfigurePolicy.cs

@@ -1,4 +1,5 @@
 using IdentityServer4.Extensions;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Jp.Management.Configuration
@@ -19,6 +20,9 @@ public static void AddPolicies(this IServiceCollection services)
                         c.User.IsAuthenticated() || 
                         c.User.HasClaim("is4-rights", "manager") || 
                         c.User.IsInRole("Administrador")));
+
+                options.AddPolicy("UserManagement", policy =>
+                    policy.RequireAuthenticatedUser());
             });
 
         }

src/Backend/Jp.UserManagement/Configuration/SwaggerConfig.cs

@@ -26,8 +26,8 @@ public static IServiceCollection AddSwagger(this IServiceCollection services)
                     Flow = "implicit",
                     AuthorizationUrl = $"{JpProjectConfiguration.IdentityServerUrl}/connect/authorize",
                     Scopes = new Dictionary<string, string> {
-                        { "management-api.owner-content", "User Management API - full access" },
-                        { "management-api.identityserver4-manager", "IS4 Management API - full access" },
+                        { "jp_api.user", "User Management API - full access" },
+                        { "jp_api.is4", "IS4 Management API - full access" },
                     }
                 });
                 options.OperationFilter<AuthorizeCheckOperationFilter>();

src/Backend/Jp.UserManagement/Controllers/ManagementController.cs

@@ -5,17 +5,17 @@
 using Jp.Application.ViewModels.UserViewModels;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Core.Notifications;
+using Jp.Domain.Interfaces;
 using Jp.Infra.CrossCutting.Tools.Model;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Jp.Domain.Interfaces;
 
 namespace Jp.Management.Controllers
 {
-    [Route("[controller]"), Authorize]
+    [Route("[controller]"), Authorize(Policy = "UserManagement")]
     public class ManagementController : ApiController
     {
         private readonly IUserManageAppService _userAppService;