From d7ef2c488b0c51d5b89e3bc2331732dfe39270f2 Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:17:23 +0200 Subject: [PATCH] fix: use valid STARTER tier in onboarding tenant creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OnboardingService passed "LOW" as the tier, but the Tier enum only has STARTER/TEAM/BUSINESS/ENTERPRISE. Tier.valueOf("LOW") threw IllegalArgumentException, which the controller caught as a blanket 409 Conflict — masking the real cause. Also catch IllegalStateException (user already has a tenant) to return 409 instead of 500. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../cameleer/saas/onboarding/OnboardingController.java | 4 +++- .../siegeln/cameleer/saas/onboarding/OnboardingService.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java index bff31fc..27e819c 100644 --- a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java +++ b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingController.java @@ -58,7 +58,9 @@ public class OnboardingController { TenantEntity tenant = onboardingService.createTrialTenant(request.name(), request.slug(), userId); return ResponseEntity.status(HttpStatus.CREATED).body(TenantResponse.from(tenant)); } catch (IllegalArgumentException e) { - return ResponseEntity.status(HttpStatus.CONFLICT).build(); + return ResponseEntity.status(HttpStatus.CONFLICT).body(null); + } catch (IllegalStateException e) { + return ResponseEntity.status(HttpStatus.CONFLICT).body(null); } } } diff --git a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java index 32102e6..fb65762 100644 --- a/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java +++ b/src/main/java/net/siegeln/cameleer/saas/onboarding/OnboardingService.java @@ -41,7 +41,7 @@ public class OnboardingService { // Create tenant via the existing vendor flow (no admin user — we'll add the caller) UUID actorId = resolveActorId(logtoUserId); - var request = new CreateTenantRequest(name, slug, "LOW", null, null); + var request = new CreateTenantRequest(name, slug, "STARTER", null, null); TenantEntity tenant = vendorTenantService.createAndProvision(request, actorId); // Add the calling user to the Logto org as owner