Codestin Search App

rmartinc · 2025-09-17T09:15:42Z

PR: #42035
Commit: 360ff70
PR branch: backport-42035-26.0
Target branch: https://github.com/keycloak/keycloak/tree/release/26.0

Cherry pick for 26.0.

keycloak-github-bot

Unreported flaky test detected, please review

keycloak-github-bot · 2025-09-17T10:05:09Z

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.broker.KcOidcBrokerTest#testReauthenticationBothBrokersWithOTPRequired

Keycloak CI - Java Distribution IT (windows-latest - temurin - 17)

java.lang.AssertionError: Expected LoginConfigTotpPage but was Sign in to provider (https://localhost:8543/auth/realms/provider/login-actions/authenticate?client_id=https%3A%2F%2Flocalhost%3A8543%2Fauth%2Frealms%2Fconsumer&tab_id=OcyhQj77iyQ&client_data=eyJydSI6Imh0dHBzOi8vbG9jYWxob3N0Ojg1NDMvYXV0aC9yZWFsbXMvY29uc3VtZXIvYnJva2VyL2tjLXNhbWwtaWRwL2VuZHBvaW50Iiwicm0iOiJwb3N0Iiwic3QiOiJPRGhHNzVvaGpObFJXVXZsaW8yT0NMb2tCOFR5QkJrajVCSHpKTW9ZMjBVLlh2cVVwbHJPWXJvLmFSNkYyR2NnVHptOGttM0hEZ1RxSVEifQ)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.keycloak.testsuite.pages.AbstractPage.assertCurrent(AbstractPage.java:47)
	at org.keycloak.testsuite.pages.LogoutSessionsPage.assertCurrent(LogoutSessionsPage.java:36)
...

Report flaky test

mposolda

Added one comment inline.

Also not 100% sure if all the messages in messages_en.properties are needed, but don't have issues with including them, so probably fine.

mposolda · 2025-09-17T11:25:04Z

js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties

+request_not_supported=Request not supported
+request_uri_not_supported=Request uri not supported
+registration_not_supported=Registration not supported
+>>>>>>> 360ff7050c (Use back keycloak-js instead of initiate login in the backend for account (#42035))


It seems this line should not be here?

Argh! Yes, I didn't remove after solving the conflict. Done!

rmartinc · 2025-09-17T11:43:46Z

Done both! And yes, the properties were not needed, I didn't detect there were two more that are not needed.

rmartinc · 2025-09-18T07:09:41Z

It seems that is finally not needed. Closing it.

rmartinc · 2025-10-28T10:32:22Z

Re-opening this for 26.0.

ahus1 · 2025-10-28T14:47:03Z

@rmartinc - this is now waiting for a UI maintainer to approve.
@ssilvert - can you please approve?

rmartinc · 2025-10-28T14:54:21Z

Thanks @ahus1! @ssilvert This is the issue we want to also move to 26.0 now we are going to tag a new 26.0.17. The same change is done in 26.2 and 26.4.

ssilvert · 2025-10-29T14:36:29Z

js/libs/ui-shared/src/context/ErrorPage.tsx

  const error = props.error;
  const errorMessage = getErrorMessage(error);
+  const networkErrorMessage = getNetworkErrorMessage(error);
+  console.error(error);


Let's try to keep the console uncluttered. I'd remove this line.

Done! But this log is in main and it was there before my changes. It was just added by the cherry-pick. 😄

@ssilvert @rmartinc Not sure how to proceed when there is a review comment for backporting something, which was already merged into main . Do we need to create another issue for main to remove the console.log line from there then?

ssilvert · 2025-10-29T14:42:35Z

js/libs/ui-shared/src/context/ErrorPage.tsx

-  if (typeof error === "string") {
-    return error;
-  }
-


Are you 100% sure that error will never be a string?

This error is always the error thrown by keycloak-js here. The keycloak-js always returns an Error for throws. If you want I can maintain the string (no problem with that). In main PR this was clearer, because the error passed here was the Error or the string obtained using another method.

@ssilvert If you want I can re-add these lines, just to move this forward. I think this PR is needed for 26.0.17.

@rmartinc If you are sure it's OK, I'm fine with it.

…ount (keycloak#42035) Closes keycloak#40463 Signed-off-by: rmartinc <[email protected]> (cherry picked from commit 360ff70)

mposolda · 2025-10-31T10:46:36Z

@ssilvert Re-assigning to you since you had some review comments. Feel free to merge whenever this looks OK to you.

@ssilvert @rmartinc Also added inline comment about console.log . Not sure how to proceed as this PR is just backport and that line is already present in main .

rmartinc requested review from a team as code owners September 17, 2025 09:15

keycloak-github-bot bot added team/ui team/cloud-native team/core-clients team/core-iam flaky-test labels Sep 17, 2025

keycloak-github-bot bot reviewed Sep 17, 2025

View reviewed changes

mposolda reviewed Sep 17, 2025

View reviewed changes

mposolda self-assigned this Sep 17, 2025

rmartinc force-pushed the backport-42035-26.0 branch from 9b65576 to ee2740a Compare September 17, 2025 11:42

rmartinc closed this Sep 18, 2025

rmartinc reopened this Oct 28, 2025

ahus1 enabled auto-merge (squash) October 28, 2025 14:45

ahus1 approved these changes Oct 28, 2025

View reviewed changes

ssilvert requested changes Oct 29, 2025

View reviewed changes

Use back keycloak-js instead of initiate login in the backend for acc…

c6d51cf

…ount (keycloak#42035) Closes keycloak#40463 Signed-off-by: rmartinc <[email protected]> (cherry picked from commit 360ff70)

auto-merge was automatically disabled October 29, 2025 15:26
Head branch was pushed to by a user without write access

rmartinc force-pushed the backport-42035-26.0 branch from ee2740a to c6d51cf Compare October 29, 2025 15:26

mposolda assigned ssilvert and unassigned mposolda Oct 31, 2025

ssilvert approved these changes Nov 3, 2025

View reviewed changes

ahus1 merged commit ff09872 into keycloak:release/26.0 Nov 3, 2025
68 checks passed

Conversation

rmartinc commented Sep 17, 2025

Uh oh!

keycloak-github-bot bot left a comment

Choose a reason for hiding this comment

Uh oh!

keycloak-github-bot bot commented Sep 17, 2025

Unreported flaky test detected

org.keycloak.testsuite.broker.KcOidcBrokerTest#testReauthenticationBothBrokersWithOTPRequired

Uh oh!

mposolda left a comment

Choose a reason for hiding this comment

Uh oh!

mposolda Sep 17, 2025

Choose a reason for hiding this comment

Uh oh!

rmartinc Sep 17, 2025

Choose a reason for hiding this comment

Uh oh!

rmartinc commented Sep 17, 2025

Uh oh!

rmartinc commented Sep 18, 2025

Uh oh!

rmartinc commented Oct 28, 2025

Uh oh!

ahus1 commented Oct 28, 2025

Uh oh!

rmartinc commented Oct 28, 2025

Uh oh!

ssilvert Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

rmartinc Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

mposolda Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ssilvert Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

rmartinc Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rmartinc Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

ssilvert Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

mposolda commented Oct 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mposolda Oct 31, 2025 •

edited

Loading

rmartinc Oct 29, 2025 •

edited

Loading