eo

Author: brunobritodev

src/.dockerignore .dockerignoresrc/.dockerignore renamed to .dockerignore

@@ -2,7 +2,7 @@
 .env
 .git
 .gitignore
-.vs
+.vs/
 .vscode
 */bin
 */obj

src/docker-compose.yml docker-compose.ymlsrc/docker-compose.yml renamed to docker-compose.yml

@@ -1,6 +1,15 @@
     version: "3"
     services:
 
+        # #############################
+        # # Database
+        # #############################
+        # redis:
+        #   image: redis:alpine
+        #   ports:
+        #       - "16379:6379"
+
+
         #############################
         # Database
         #############################
@@ -39,7 +48,7 @@
                 SQLSERVER_CONNECTION: "Server=database,1433;Initial Catalog=JpProject;Persist Security Info=False;User ID=sa;Password=@Password1;MultipleActiveResultSets=False;Connection Timeout=30;"
                 ASPNETCORE_ENVIRONMENT: "Development"
                 ISSUER_URI: "http://localhost:5000"
-                # PUBLIC_URI: "http://localhost:5000"
+                AMBIENT: "linux"
 
         #############################
         # Management API
@@ -62,6 +71,7 @@
                 ASPNETCORE_ENVIRONMENT: "Development"
                 AUTHORITY: "http://sso:5000"
                 VALIDATE_ISSUER: "false"
+                AMBIENT: "linux"
 
         #############################
         # User management UI

src/Backend/Jp.UserManagement/Properties/launchSettings.json

@@ -23,9 +23,6 @@
       "launchBrowser": true,
       "launchUrl": "swagger/index.html",
       "environmentVariables": {
-        "SQLSERVER_PORT": "1433",
-        "SQLSERVER_HOST": "localhost",
-        "SQLSERVER_PASSWORD": "@Password1",
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:5003;https://localhost:5002"

src/Backend/Jp.UserManagement/Startup.cs

@@ -8,16 +8,19 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace Jp.UserManagement
 {
     public class Startup
     {
+        private readonly ILogger<Startup> _logger;
         public IConfiguration Configuration { get; }
         public IHostingEnvironment HostEnvironment { get; }
 
-        public Startup(IHostingEnvironment hostEnvironment)
+        public Startup(IHostingEnvironment hostEnvironment, ILogger<Startup> logger)
         {
+            _logger = logger;
             var builder = new ConfigurationBuilder()
                 .SetBasePath(hostEnvironment.ContentRootPath)
                 .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
@@ -42,25 +45,25 @@ public void ConfigureServices(IServiceCollection services)
             services.AddIdentity(Configuration);
             services.ConfigureCors();
 
-
-            //services.AddAuthentication(IdentityServerAuthenticationDefaults.AuthenticationScheme)
+            var authorityUri = Environment.GetEnvironmentVariable("AUTHORITY") ?? "http://localhost:5000";
+            _logger.LogInformation($"Authority URI: {authorityUri}");
             services.AddAuthentication(options =>
                 {
                     options.DefaultAuthenticateScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
                     options.DefaultChallengeScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
-                    
+
                 })
                     .AddIdentityServerAuthentication(options =>
                                                     {
-                                                        options.Authority = Environment.GetEnvironmentVariable("AUTHORITY") ?? "http://localhost:5000";
+                                                        options.Authority = authorityUri;
                                                         options.RequireHttpsMetadata = false;
                                                         options.ApiSecret = "Q&tGrEQMypEk.XxPU:%bWDZMdpZeJiyMwpLv4F7d**w9x:7KuJ#fy,E8KPHpKz++";
                                                         options.ApiName = "UserManagementApi";
 
 
                                                         options.JwtBearerEvents.OnMessageReceived = (messae) =>
                                                         {
-                                                            messae.Options.TokenValidationParameters.ValidateIssuer = bool.TryParse(Environment.GetEnvironmentVariable("VALIDATE_ISSUER") ?? "true", out _);
+                                                            messae.Options.TokenValidationParameters.ValidateIssuer = bool.Parse(Environment.GetEnvironmentVariable("VALIDATE_ISSUER") ?? "true");
                                                             return Task.CompletedTask;
                                                         };
                                                     });