diff --git a/.github/actions/docker-build-publish/action.yml b/.github/actions/docker-build-publish/action.yml index 8c9f037..1ef6fa0 100644 --- a/.github/actions/docker-build-publish/action.yml +++ b/.github/actions/docker-build-publish/action.yml @@ -43,11 +43,11 @@ runs: if: ${{ github.ref == 'refs/heads/main' && success() }} shell: bash run: | - docker build -t ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.5 -f "${{ github.workspace }}/${{ inputs.dockerfile-path }}" . + docker build -t ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.6 -f "${{ github.workspace }}/${{ inputs.dockerfile-path }}" . - name: Publish Docker Image if: ${{ github.ref == 'refs/heads/main' && success() }} shell: bash run: | - docker push ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.5 + docker push ${{ inputs.registry-username }}/${{ inputs.image-name }}:v1.5.6 diff --git a/src/Services/Booking/src/Booking.Api/appsettings.docker.json b/src/Services/Booking/src/Booking.Api/appsettings.docker.json index 690322f..f19e69e 100644 --- a/src/Services/Booking/src/Booking.Api/appsettings.docker.json +++ b/src/Services/Booking/src/Booking.Api/appsettings.docker.json @@ -26,7 +26,7 @@ "Port": 5672 }, "Jwt": { - "Authority": "http://myidentityserver.com", + "Authority": "http://booking-microservices.com/identity", "Audience": "booking-api", "RequireHttpsMetadata": false }, diff --git a/src/Services/Flight/src/Flight.Api/appsettings.docker.json b/src/Services/Flight/src/Flight.Api/appsettings.docker.json index 1a70dc4..5a3ab1e 100644 --- a/src/Services/Flight/src/Flight.Api/appsettings.docker.json +++ b/src/Services/Flight/src/Flight.Api/appsettings.docker.json @@ -23,7 +23,7 @@ "ConnectionString": "Server=postgres;Port=5432;Database=flight;User Id=postgres;Password=postgres;Include Error Detail=true" }, "Jwt": { - "Authority": "http://myidentityserver.com", + "Authority": "http://booking-microservices.com/identity", "Audience": "flight-api", "RequireHttpsMetadata": false }, diff --git a/src/Services/Identity/src/Identity.Api/Identity.Api.csproj b/src/Services/Identity/src/Identity.Api/Identity.Api.csproj index 3ad417a..51a2b7c 100644 --- a/src/Services/Identity/src/Identity.Api/Identity.Api.csproj +++ b/src/Services/Identity/src/Identity.Api/Identity.Api.csproj @@ -7,11 +7,11 @@ - + - <_ContentIncludedByDefault Remove="keys\is-signing-key-C01EF7C986B61650360AFA59291E65BC.json"/> + <_ContentIncludedByDefault Remove="keys\is-signing-key-C01EF7C986B61650360AFA59291E65BC.json" /> diff --git a/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs b/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs index dbc9126..492a3ed 100644 --- a/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs +++ b/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs @@ -25,7 +25,6 @@ public static class IdentityServerExtensions var identityServerBuilder = services.AddIdentityServer(options => { - options.IssuerUri = "http://myidentityserver.com"; options.Events.RaiseErrorEvents = true; options.Events.RaiseInformationEvents = true; options.Events.RaiseFailureEvents = true; @@ -39,7 +38,7 @@ public static class IdentityServerExtensions .AddResourceOwnerValidator(); //ref: https://documentation.openiddict.com/configuration/encryption-and-signing-credentials.html - identityServerBuilder.AddDeveloperSigningCredential(); + // identityServerBuilder.AddDeveloperSigningCredential(); return services; } diff --git a/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs b/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs index 6a79089..cc8eeaf 100644 --- a/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs +++ b/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs @@ -115,11 +115,11 @@ public static class InfrastructureExtensions app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name)); - app.Use((httpContext, next) => - { - httpContext.Request.Scheme = "https"; - return next(); - }); + // app.Use((httpContext, next) => + // { + // httpContext.Request.Scheme = "https"; + // return next(); + // }); if (env.IsDevelopment()) { diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json b/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json index 3db6315..a14e7b5 100644 --- a/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json +++ b/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json @@ -9,7 +9,7 @@ "ConnectionString": "Server=postgres;Port=5432;Database=persist_message;User Id=postgres;Password=postgres;Include Error Detail=true" }, "Jwt": { - "Authority": "http://myidentityserver.com", + "Authority": "http://booking-microservices.com/identity", "Audience": "passenger-api", "RequireHttpsMetadata": false },