Skip to content

allow client token with no estate id #626

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
StuartFerguson merged 1 commit into from
Oct 14, 2026
Merged

allow client token with no estate id #626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 29 additions & 11 deletions EstateReportingAPI/Common/EstateContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Authorization;
using System.Security.Claims;

namespace EstateReportingAPI.Common
{
Expand Down Expand Up @@ -117,23 +118,40 @@ private async Task HandleAuthenticatedRequestAsync(
EstateContext estateContext,
Guid? headerEstateId)
{
string? estateClaim = httpContext.User.FindFirst("estateId")?.Value;
bool isUserToken = httpContext.User.HasClaim(claim => claim.Type == ClaimTypes.NameIdentifier);
Comment thread
StuartFerguson marked this conversation as resolved.
Resolved

if (Guid.TryParse(estateClaim, out Guid authenticatedEstateId) == false ||
authenticatedEstateId == Guid.Empty)
if (isUserToken)
{
httpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
string? estateClaim = httpContext.User.FindFirst("estateId")?.Value;

if (!Guid.TryParse(estateClaim, out Guid authenticatedEstateId) ||
authenticatedEstateId == Guid.Empty)
{
httpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
}

if (headerEstateId.HasValue &&
headerEstateId.Value != authenticatedEstateId)
{
httpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
}

estateContext.SetEstate(authenticatedEstateId);
}

if (headerEstateId.HasValue && headerEstateId.Value != authenticatedEstateId)
else
{
httpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
// Client-credentials token: tenant comes from the trusted ACL header.
if (!headerEstateId.HasValue)
{
httpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
return;
}

estateContext.SetEstate(headerEstateId.Value);
}

estateContext.SetEstate(authenticatedEstateId);

await _next(httpContext);
}
}
Expand Down
Loading