Skip to content

Fix for UseExceptionHandler no longer working since v10.3 RC #13218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikolajlauridsen merged 3 commits into from
Oct 26, 2022
Merged

Fix for UseExceptionHandler no longer working since v10.3 RC #13218

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79a6d56
Fix for UseExceptionHandler no longer working since v10.3 RC
justin-nevitech Oct 16, 2022
6c96d8a
Merge remote-tracking branch 'origin/v11/contrib' into exception-hand…
nikolajlauridsen Oct 26, 2022
bb7e889
Update the management api path to match the new one
nikolajlauridsen Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 28 additions & 15 deletions src/Umbraco.Cms.ManagementApi/ManagementApiComposer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,24 +84,37 @@ public void Compose(IUmbracoBuilder builder)
"BackofficeSwagger",
applicationBuilder =>
{
applicationBuilder.UseExceptionHandler(exceptionBuilder => exceptionBuilder.Run(async context =>
{
Exception? exception = context.Features.Get<IExceptionHandlerPathFeature>()?.Error;
if (exception is null)
// Only use the API exception handler when we are requesting an API
applicationBuilder.UseWhen(
httpContext =>
{
return;
}
GlobalSettings? settings = httpContext.RequestServices.GetRequiredService<IOptions<GlobalSettings>>().Value;
IHostingEnvironment hostingEnvironment = httpContext.RequestServices.GetRequiredService<IHostingEnvironment>();
var officePath = settings.GetBackOfficePath(hostingEnvironment);

var response = new ProblemDetails
return httpContext.Request.Path.Value?.StartsWith($"{officePath}/management/api/") ?? false;
},
innerBuilder =>
{
Title = exception.Message,
Detail = exception.StackTrace,
Status = StatusCodes.Status500InternalServerError,
Instance = exception.GetType().Name,
Type = "Error",
};
await context.Response.WriteAsJsonAsync(response);
}));
innerBuilder.UseExceptionHandler(exceptionBuilder => exceptionBuilder.Run(async context =>
{
Exception? exception = context.Features.Get<IExceptionHandlerPathFeature>()?.Error;
if (exception is null)
{
return;
}

var response = new ProblemDetails
{
Title = exception.Message,
Detail = exception.StackTrace,
Status = StatusCodes.Status500InternalServerError,
Instance = exception.GetType().Name,
Type = "Error",
};
await context.Response.WriteAsJsonAsync(response);
}));
});
},
applicationBuilder =>
{
Expand Down