Fix organization creation when domain is empty by ayushmanayush · Pull Request #50857 · keycloak/keycloak

ayushmanayush · 2026-07-14T08:59:14Z

Description

Fixes the regression introduced in 26.7.0 where creating an organization
without specifying a domain results in an "Invalid domain format" error.

Root cause

The frontend converted empty domain values into domain objects, causing
validation to fail even though the domain field is optional.

Solution

Filter out empty domain values before creating the domain objects so that
validation is only applied to non-empty domains.
Fixes #50825

Signed-off-by: ayush <ishusingh1404@gmail.com>

Copilot

Pull request overview

Fixes organization creation when the optional domain field is empty.

Changes:

Filters blank domains before API conversion.
Allows blank input in shared domain validation.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
`Organizations.java`	Treats blank domains as absent.
`OrganizationForm.tsx`	Excludes blank domains from requests.


    public static void validateDomain(String rawDomain) {
-        if (rawDomain == null) {
+        if (rawDomain == null || isBlank(rawDomain)) {


Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

+  domains: org.domains
+    ?.filter((d) => d.trim() !== "")
+    .map((d) => ({ name: d, verified: false })),



    public static void validateDomain(String rawDomain) {
-        if (rawDomain == null) {
+        if (rawDomain == null || isBlank(rawDomain)) {


Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.


    public static void validateDomain(String rawDomain) {
-        if (rawDomain == null) {
+        if (rawDomain == null || isBlank(rawDomain)) {


+  domains: org.domains
+    ?.filter((d) => d.trim() !== "")
+    .map((d) => ({ name: d, verified: false })),


sguilhen · 2026-07-17T02:49:24Z

@ssilvert @edewit could you please review this one? It is a fix for a regression in 26.7

ssilvert · 2026-07-17T17:50:07Z

@ayushmanayush All the suggestions from Copilot appear to be valid. Please fix them before we proceed with further review.

ayushmanayush · 2026-07-17T18:34:07Z

Ok I'll further look into it and update asap

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

+  domains: org.domains
+    ?.filter((d) => d.trim() !== "")
+    .map((d) => ({ name: d, verified: false })),


Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.


    public static void validateDomain(String rawDomain) {
-        if (rawDomain == null) {
+        if (isBlank(rawDomain)) {


ssilvert · 2026-07-21T16:17:03Z

@ayushmanayush We need you to sign your commits so that DCO will pass.

Signed-off-by: ayush <ishusingh1404@gmail.com>

sguilhen · 2026-07-22T14:21:15Z

I think all commits need to be signed-off for the DCO check to pass. So either add the sign-off or, better yet, squash them into one

keycloak-github-bot

Unreported flaky test detected, please review

keycloak-github-bot · 2026-07-31T13:40:05Z

Unreported flaky test detected

If the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.oauth.ClientAuthPostMethodTest#testPostAuthenticationNotAllowedWhenBasicRequested

Keycloak CI - Base IT (6)

java.lang.NullPointerException: Cannot read field "features" because the return value of "org.keycloak.common.Profile.getInstance()" is null
	at org.keycloak.common.Profile.isFeatureEnabled(Profile.java:534)
	at org.keycloak.protocol.oidc.OIDCClientSecretConfigWrapper.<init>(OIDCClientSecretConfigWrapper.java:41)
	at org.keycloak.protocol.oidc.OIDCClientSecretConfigWrapper.fromClientRepresentation(OIDCClientSecretConfigWrapper.java:49)
	at org.keycloak.testsuite.oauth.ClientAuthPostMethodTest.testPostAuthenticationNotAllowedWhenBasicRequested(ClientAuthPostMethodTest.java:141)
...

Report flaky test

org.keycloak.testsuite.oauth.ClientAuthPostMethodTest#testBasicAuthenticationNotAllowedWhenPostRequested

Keycloak CI - Base IT (6)

java.lang.NullPointerException: Cannot read field "features" because the return value of "org.keycloak.common.Profile.getInstance()" is null
	at org.keycloak.common.Profile.isFeatureEnabled(Profile.java:534)
	at org.keycloak.protocol.oidc.OIDCClientSecretConfigWrapper.<init>(OIDCClientSecretConfigWrapper.java:41)
	at org.keycloak.protocol.oidc.OIDCClientSecretConfigWrapper.fromClientRepresentation(OIDCClientSecretConfigWrapper.java:49)
	at org.keycloak.testsuite.oauth.ClientAuthPostMethodTest.testBasicAuthenticationNotAllowedWhenPostRequested(ClientAuthPostMethodTest.java:112)
...

Report flaky test

org.keycloak.testsuite.forms.MultipleTabsLoginTest#multipleTabsParallelLoginTestWithAuthSessionExpiredAndRequiredAction

Keycloak CI - Forms IT (chrome)

org.opentest4j.AssertionFailedError: expected: <true> but was: <false>
	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
	at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
	at org.junit.jupiter.api.AssertTrue.failNotTrue(AssertTrue.java:63)
	at org.junit.jupiter.api.AssertTrue.assertTrue(AssertTrue.java:36)
...

Report flaky test

org.keycloak.testsuite.forms.MultipleTabsLoginTest#multipleTabsParallelLoginTestWithAuthSessionExpiredAndRefreshInTab1

Keycloak CI - Forms IT (chrome)

org.opentest4j.AssertionFailedError: expected: <true> but was: <false>
	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
	at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
	at org.junit.jupiter.api.AssertTrue.failNotTrue(AssertTrue.java:63)
	at org.junit.jupiter.api.AssertTrue.assertTrue(AssertTrue.java:36)
...

Report flaky test

ahus1 · 2026-08-02T11:24:54Z

I think all commits need to be signed-off for the DCO check to pass. So either add the sign-off or, better yet, squash them into one

@sguilhen - ideally yes. Still, the last commit is signed off, and we might proceed with that if no-one objects. I approved the build, the frontend has some problems.

@ayushmanayush - can you please review those?

edewit · 2026-08-03T09:05:35Z

there is also a prettier problem in
js/apps/admin-ui/src/organizations/OrganizationForm.test.tsx

sguilhen · 2026-08-07T14:15:43Z

Thanks for the contribution @ayushmanayush! Since this has been idle for a while and it is a fix for a regression, I went ahead and opened a new PR with the necessary adjustments so we can get it merged.

The main changes from the original PR:

added trim() in the .map() call - the original code filtered on d.trim() but mapped the untrimmed value, so inputs like " example.com " would pass the filter but still hit server-side validation with leading/trailing whitespace.
added a test for the trimming behavior and fixed prettier formatting in the test file.
dropped the unrelated removal of stripOrganizationId() and its import, which were accidentally included (likely from a merge).

Closing in favor of #51542.

Copilot AI review requested due to automatic review settings July 14, 2026 08:59

ayushmanayush requested review from a team as code owners July 14, 2026 08:59

keycloak-github-bot Bot added the team/core-iam label Jul 14, 2026

Copilot started reviewing on behalf of ayushmanayush July 14, 2026 09:02 View session

Fix organization creation when domain is empty Fixes keycloak#50825

d4a175b

Signed-off-by: ayush <ishusingh1404@gmail.com>

Copilot AI reviewed Jul 14, 2026

View reviewed changes

Comment thread services/src/main/java/org/keycloak/organization/utils/Organizations.java Outdated

public static void validateDomain(String rawDomain) {

if (rawDomain == null) {

if (rawDomain == null || isBlank(rawDomain)) {

Copilot AI review requested due to automatic review settings July 14, 2026 09:10

ayushmanayush force-pushed the fix-50825 branch from 171810b to d4a175b Compare July 14, 2026 09:10

Copilot started reviewing on behalf of ayushmanayush July 14, 2026 09:11 View session

Copilot AI reviewed Jul 14, 2026

View reviewed changes

Merge branch 'main' into fix-50825

0a8ef58

Copilot AI review requested due to automatic review settings July 15, 2026 10:15

Copilot started reviewing on behalf of ayushmanayush July 15, 2026 10:26 View session

Copilot AI reviewed Jul 15, 2026

View reviewed changes

sguilhen requested review from edewit and ssilvert July 17, 2026 02:48

Fixed redundant code

fa4e3c3

Copilot AI review requested due to automatic review settings July 17, 2026 18:41

Copilot started reviewing on behalf of ayushmanayush July 17, 2026 18:42 View session

Copilot AI reviewed Jul 17, 2026

View reviewed changes

Comment thread js/apps/admin-ui/src/organizations/OrganizationForm.tsx

Comment on lines +24 to +26

domains: org.domains

?.filter((d) => d.trim() !== "")

.map((d) => ({ name: d, verified: false })),

Copilot AI review requested due to automatic review settings July 17, 2026 18:54

Copilot started reviewing on behalf of ayushmanayush July 17, 2026 18:55 View session

Copilot AI reviewed Jul 17, 2026

View reviewed changes

Comment thread services/src/main/java/org/keycloak/organization/utils/Organizations.java

public static void validateDomain(String rawDomain) {

if (rawDomain == null) {

if (isBlank(rawDomain)) {

added test cases

bff9483

Signed-off-by: ayush <ishusingh1404@gmail.com>

ayushmanayush force-pushed the fix-50825 branch from 70f3515 to bff9483 Compare July 22, 2026 10:17

keycloak-github-bot Bot added the flaky-test label Jul 31, 2026

keycloak-github-bot Bot reviewed Jul 31, 2026

View reviewed changes

sguilhen closed this Aug 7, 2026

Uh oh!

Conversation

ayushmanayush commented Jul 14, 2026

Description

Root cause

Solution

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

sguilhen commented Jul 17, 2026

Uh oh!

ssilvert commented Jul 17, 2026

Uh oh!

ayushmanayush commented Jul 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

ssilvert commented Jul 21, 2026

Uh oh!

sguilhen commented Jul 22, 2026

Uh oh!

keycloak-github-bot Bot left a comment

Choose a reason for hiding this comment

Uh oh!

keycloak-github-bot Bot commented Jul 31, 2026

Unreported flaky test detected

org.keycloak.testsuite.oauth.ClientAuthPostMethodTest#testPostAuthenticationNotAllowedWhenBasicRequested

org.keycloak.testsuite.oauth.ClientAuthPostMethodTest#testBasicAuthenticationNotAllowedWhenPostRequested

org.keycloak.testsuite.forms.MultipleTabsLoginTest#multipleTabsParallelLoginTestWithAuthSessionExpiredAndRequiredAction

org.keycloak.testsuite.forms.MultipleTabsLoginTest#multipleTabsParallelLoginTestWithAuthSessionExpiredAndRefreshInTab1

Uh oh!

ahus1 commented Aug 2, 2026

Uh oh!

edewit commented Aug 3, 2026

Uh oh!

sguilhen commented Aug 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ayushmanayush commented Jul 17, 2026 •

edited

Loading