Skip to content

Fix organization creation when domain field is empty #51542

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
pedroigor merged 1 commit into from
Aug 10, 2026
+61 −2
Merged

Fix organization creation when domain field is empty #51542

Show file tree
Hide file tree
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
57 changes: 57 additions & 0 deletions js/apps/admin-ui/src/organizations/OrganizationForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { describe, expect, it } from "vitest";
import { convertToOrg, OrganizationFormType } from "./OrganizationForm";

describe("convertToOrg", () => {
it("omits blank domain entries", () => {
const form = {
name: "test-org",
alias: "test-org",
domains: [""],
} as OrganizationFormType;

const result = convertToOrg(form);

expect(result.domains).toEqual([]);
});

it("keeps valid domains and drops blanks mixed in", () => {
const form = {
name: "test-org",
alias: "test-org",
domains: ["example.com", "", "acme.com"],
} as OrganizationFormType;

const result = convertToOrg(form);

expect(result.domains).toEqual([
{ name: "example.com", verified: false },
{ name: "acme.com", verified: false },
]);
});

it("trims whitespace from domain names", () => {
const form = {
name: "test-org",
alias: "test-org",
domains: [" example.com ", " ", "acme.com"],
} as OrganizationFormType;

const result = convertToOrg(form);

expect(result.domains).toEqual([
{ name: "example.com", verified: false },
{ name: "acme.com", verified: false },
]);
});

it("handles undefined domains", () => {
const form = {
name: "test-org",
alias: "test-org",
} as OrganizationFormType;

const result = convertToOrg(form);

expect(result.domains).toBeUndefined();
});
});
4 changes: 3 additions & 1 deletion js/apps/admin-ui/src/organizations/OrganizationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ export const convertToOrg = (
org: OrganizationFormType,
): OrganizationRepresentation => ({
...org,
domains: org.domains?.map((d) => ({ name: d, verified: false })),
domains: org.domains
?.filter((d) => d.trim() !== "")
.map((d) => ({ name: d.trim(), verified: false })),
attributes: keyValueToArray(org.attributes),
});

Expand Down
2 changes: 1 addition & 1 deletion services/src/main/java/org/keycloak/organization/utils/Organizations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public static int getDomainPartsSize(String domain) {
}

public static void validateDomain(String rawDomain) {
if (rawDomain == null) {
if (isBlank(rawDomain)) {
return;
}

Expand Down
Loading