Skip to content

Fix organization creation when domain is empty #50857

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

Open
ayushmanayush wants to merge 4 commits into
base: main
Choose a base branch
from
+46 −3
Open

Fix organization creation when domain is empty #50857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4a175b
Fix organization creation when domain is empty Fixes #50825
ayushmanayush Jul 14, 2026
0a8ef58
Merge branch 'main' into fix-50825
ayushmanayush Jul 15, 2026
fa4e3c3
Fixed redundant code
ayushmanayush Jul 17, 2026
bff9483
added test cases
ayushmanayush Jul 17, 2026
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
42 changes: 42 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,42 @@
import { describe, expect, it } from "vitest";
import { convertToOrg, OrganizationFormType } from "./OrganizationForm";

describe("convertToOrg", () => {
it("omits blank domain entries", () => {
const form: OrganizationFormType = {
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: OrganizationFormType = {
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: OrganizationFormType = {
name: "test-org",
alias: "test-org",
} as OrganizationFormType;

const result = convertToOrg(form);

expect(result.domains).toBeUndefined();
});
});
5 changes: 3 additions & 2 deletions 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 @@ -17,12 +17,13 @@ export type OrganizationFormType = AttributeForm &
Omit<OrganizationRepresentation, "domains" | "attributes"> & {
domains?: string[];
};

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, verified: false })),
Comment on lines +24 to +26
Comment on lines +24 to +26
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 @@ -207,7 +207,7 @@ public static int getDomainPartsSize(String domain) {
}

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

Expand Down