diff --git a/deployments/docker-compose/infrastracture.yaml b/deployments/docker-compose/infrastracture.yaml index 8dac1a1..cb99e77 100644 --- a/deployments/docker-compose/infrastracture.yaml +++ b/deployments/docker-compose/infrastracture.yaml @@ -52,6 +52,8 @@ services: ####################################################### # EventStoreDB ####################################################### + #https://stackoverflow.com/questions/65272764/ports-are-not-available-listen-tcp-0-0-0-0-50070-bind-an-attempt-was-made-to + eventstore: container_name: eventstore image: eventstore/eventstore:21.2.0-buster-slim diff --git a/src/BuildingBlocks/Jwt/JwtExtensions.cs b/src/BuildingBlocks/Jwt/JwtExtensions.cs index e526541..d92a23a 100644 --- a/src/BuildingBlocks/Jwt/JwtExtensions.cs +++ b/src/BuildingBlocks/Jwt/JwtExtensions.cs @@ -1,4 +1,3 @@ -using BuildingBlocks.Utils; using BuildingBlocks.Web; using Duende.IdentityServer.Models; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -17,6 +16,7 @@ public static class JwtExtensions { options.Authority = jwtOptions.Authority; options.TokenValidationParameters.ValidateAudience = false; + options.RequireHttpsMetadata = jwtOptions.RequireHttpsMetadata; }); if (!string.IsNullOrEmpty(jwtOptions.Audience)) diff --git a/src/Services/Flight/src/Flight.Api/appsettings.docker.json b/src/Services/Flight/src/Flight.Api/appsettings.docker.json index 1c2d3fd..1a70dc4 100644 --- a/src/Services/Flight/src/Flight.Api/appsettings.docker.json +++ b/src/Services/Flight/src/Flight.Api/appsettings.docker.json @@ -23,8 +23,9 @@ "ConnectionString": "Server=postgres;Port=5432;Database=flight;User Id=postgres;Password=postgres;Include Error Detail=true" }, "Jwt": { - "Authority": "identity:5005", - "Audience": "flight-api" + "Authority": "http://myidentityserver.com", + "Audience": "flight-api", + "RequireHttpsMetadata": false }, "RabbitMq": { "HostName": "rabbitmq", diff --git a/src/Services/Flight/src/Flight.Api/appsettings.json b/src/Services/Flight/src/Flight.Api/appsettings.json index e69597f..85e76f9 100644 --- a/src/Services/Flight/src/Flight.Api/appsettings.json +++ b/src/Services/Flight/src/Flight.Api/appsettings.json @@ -30,7 +30,8 @@ }, "Jwt": { "Authority": "https://localhost:5005", - "Audience": "flight-api" + "Audience": "flight-api", + "RequireHttpsMetadata": true }, "RabbitMqOptions": { "HostName": "localhost",