From 8e4e0251b52b10ced3cf757a560612ca69a28df1 Mon Sep 17 00:00:00 2001 From: Hammerbeck Date: Wed, 31 Jul 2024 11:20:32 +0200 Subject: [PATCH] Only skip default login on authenticateFailure --- .../Helpers/JwtBearerEventsHelper.cs | 4 ++-- src/Altinn.Correspondence.API/Program.cs | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Altinn.Correspondence.API/Helpers/JwtBearerEventsHelper.cs b/src/Altinn.Correspondence.API/Helpers/JwtBearerEventsHelper.cs index 503c748c..fd9ffb65 100644 --- a/src/Altinn.Correspondence.API/Helpers/JwtBearerEventsHelper.cs +++ b/src/Altinn.Correspondence.API/Helpers/JwtBearerEventsHelper.cs @@ -9,8 +9,8 @@ public static Task OnAuthenticationFailed(AuthenticationFailedContext context) { context.Response.StatusCode = StatusCodes.Status401Unauthorized; context.Response.ContentType = "application/json"; - context.Response.Headers.Append("WWW-Authenticate", context.Options.Challenge + " error=\"invalid_token\", error_description=\"" + context.Exception.Message + "\""); - string err = ""; + context.Response.Headers.Append("WWW-Authenticate", context.Options.Challenge + " error=\"invalid_token\""); + string err = context.Exception.Message; if (context.Exception is SecurityTokenInvalidIssuerException) { context.Response.StatusCode = StatusCodes.Status403Forbidden; diff --git a/src/Altinn.Correspondence.API/Program.cs b/src/Altinn.Correspondence.API/Program.cs index 1f5fa07e..d20ff84f 100644 --- a/src/Altinn.Correspondence.API/Program.cs +++ b/src/Altinn.Correspondence.API/Program.cs @@ -88,7 +88,10 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config OnAuthenticationFailed = context => JWTBearerEventsHelper.OnAuthenticationFailed(context), OnChallenge = c => { - c.HandleResponse(); + if (c.AuthenticateFailure != null) + { + c.HandleResponse(); + } return Task.CompletedTask; } };