Skip to content

fix(ctrl): Add fallback for null defaultOrganization during OIDC login #183

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
lbroudoux merged 1 commit into from
Jun 9, 2026
Merged

fix(ctrl): Add fallback for null defaultOrganization during OIDC login #183

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
49 changes: 36 additions & 13 deletions control-plane/src/main/java/io/reshapr/ctrl/security/AuthenticationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.NewCookie;
Expand Down Expand Up @@ -131,8 +132,7 @@ public Response loginWithReshapr(LoginRequest loginRequest) {
}

// Generate a token for the authenticated user
String token = generateTokenForUser(RESHAPR_IDENTITY_PROVIDER, user, user.defaultOrganization.name);
logger.infof("Authentication successful for user: %s", loginRequest.username);
String token = resolveOrganizationAndGenerateToken(RESHAPR_IDENTITY_PROVIDER, user);

return Response.ok(token).build();
}
Expand Down Expand Up @@ -238,8 +238,7 @@ public Response callbackFromOidc(@QueryParam("code") String authorizationCode, @
}

// Generate a token for the authenticated user
String token = generateTokenForUser(RESHAPR_IDENTITY_PROVIDER, user, user.defaultOrganization.name);
logger.infof("Authentication successful for user: %s", user.username);
String token = resolveOrganizationAndGenerateToken(RESHAPR_IDENTITY_PROVIDER, user);

return Response.seeOther(URI.create(redirectUri + "?token=" + token)).build();
}
Expand Down Expand Up @@ -298,8 +297,13 @@ public Response completeOnboarding(@CookieParam(RESHAPR_ONBOARDING_COOKIE) Strin
}

// Generate a token for the authenticated user.
String token = generateTokenForUser(RESHAPR_IDENTITY_PROVIDER, user, user.defaultOrganization.name);
logger.infof("Authentication successful for user: %s", user.username);
String token;
try {
token = resolveOrganizationAndGenerateToken(RESHAPR_IDENTITY_PROVIDER, user);
} catch (WebApplicationException e) {
TemplateInstance instance = Templates.onboardingError(username, organizationName, redirectUri, e.getMessage());
return Response.ok(instance.render()).build();
}

// Reset onboarding cookie to prevent replaying the onboarding.
NewCookie cookie = new NewCookie.Builder(RESHAPR_ONBOARDING_COOKIE)
Expand Down Expand Up @@ -328,15 +332,10 @@ public Response generateLoginToken(DelegatedLoginRequest loginRequest) {
return Response.status(Response.Status.NOT_FOUND).entity("User not found").build();
}

if (user.defaultOrganization == null) {
logger.warnf("User %s has no default organization", loginRequest.username);
return Response.status(Response.Status.BAD_REQUEST).entity("User has no organization").build();
}

// Generate a JWT token for the user.
String token = generateTokenForUser("delegated", user, user.defaultOrganization.name);
String token = resolveOrganizationAndGenerateToken("delegated", user);

logger.infof("Delegated login token generated for user: %s (org: %s)", user.username, user.defaultOrganization.name);
logger.infof("Delegated login token generated for user: %s", user.username);
return Response.ok(token).build();
}

Expand Down Expand Up @@ -447,4 +446,28 @@ private String generateTokenForUser(String authorityId, User user, String organi

return token;
}

private Organization resolveDefaultOrganization(User user) {
if (user.defaultOrganization != null) {
return user.defaultOrganization;
}
if (user.organizations != null && !user.organizations.isEmpty()) {
// Fallback to the first available organization
return user.organizations.get(0);
}
return null;
}

private String resolveOrganizationAndGenerateToken(String authorityId, User user) {
Organization defaultOrg = resolveDefaultOrganization(user);
if (defaultOrg == null) {
logger.warnf("User %s has no organizations assigned", user.username);
throw new WebApplicationException("User has no organizations assigned", Response.Status.FORBIDDEN);
}

String token = generateTokenForUser(authorityId, user, defaultOrg.name);
logger.infof("Authentication successful for user: %s (org: %s)", user.username, defaultOrg.name);

return token;
}
}