From de37760bc6e8a5986664ca286d5e2e76c9833ec4 Mon Sep 17 00:00:00 2001 From: nielses Date: Thu, 15 Jun 2023 08:09:26 +1000 Subject: [PATCH] Update YamlDotNet Disable reload of the config, as M1 Macs don't support it. Add build instructions to README Add all claims without filtering --- README.md | 8 ++++++++ src/Dockerfile | 2 ++ src/OpenIdConnectServerMock.csproj | 8 ++++---- src/Services/ProfileService.cs | 9 ++------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d16435d..77ec3a8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +# build docker image + +`docker build -t skrymer/mock-oidc-server:1.0.4 ./src` + +publish and build for arm and amd + +`docker buildx build --platform linux/amd64,linux/arm64 -t skrymer/mock-oidc-server:1.0.4 --push ./src` + # OpenId Connect Server Mock ![Run Tests badge](https://github.com/Soluto/oidc-server-mock/workflows/Run%20Tests/badge.svg) diff --git a/src/Dockerfile b/src/Dockerfile index b059d3e..9762449 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -28,6 +28,8 @@ COPY --from=source /OpenIdConnectServerMock /OpenIdConnectServerMock WORKDIR /OpenIdConnectServerMock ENV ASPNETCORE_ENVIRONMENT=Development +# Disable reload of the config, as M1 Macs don't support it. See https://github.com/elsa-workflows/elsa-core/issues/3114 +ENV ASPNETCORE_hostBuilder__reloadConfigOnChange: "false" EXPOSE 80 diff --git a/src/OpenIdConnectServerMock.csproj b/src/OpenIdConnectServerMock.csproj index fba366d..a75d192 100644 --- a/src/OpenIdConnectServerMock.csproj +++ b/src/OpenIdConnectServerMock.csproj @@ -26,11 +26,11 @@ - - - + + + - + diff --git a/src/Services/ProfileService.cs b/src/Services/ProfileService.cs index e6e8523..7327b1c 100644 --- a/src/Services/ProfileService.cs +++ b/src/Services/ProfileService.cs @@ -26,15 +26,10 @@ public Task GetProfileDataAsync(ProfileDataRequestContext context) if (user != null) { Logger.LogDebug("The user was found in store"); - var claims = new List - { - new Claim("uid", subjectId), - }; - Logger.LogDebug("Adding claims {claims}", claims); - context.IssuedClaims.AddRange(claims); + Logger.LogDebug("User claims {claims}", user.Claims); + context.IssuedClaims.AddRange(user.Claims); } - return Task.CompletedTask; }