Repository navigation
Add organization admin crud events - #32358
mzvankovich wants to merge 1 commit into
Conversation
|
@pedroigor - this might be of interest for your team. |
18d5984 to
ff9a185
Compare
Unreported flaky test detectedIf 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.forms.ResetPasswordTest#resetPasswordDisabledUserKeycloak CI - Forms IT (chrome) org.keycloak.testsuite.forms.ResetPasswordTest#resetPasswordExpiredCodeAndAuthSessionKeycloak CI - Forms IT (chrome) |
8c637f8 to
a6271a7
Compare
Resolve keycloak#31421, resolve keycloak#30180 Signed-off-by: Maksim Zvankovich <m.zvankovich@rheagroup.com>
a6271a7 to
5b500dc
Compare
|
@mzvankovich - While this is in review by a maintainer, there is no need to rebase your PR unless you see conflicts in your PR. A maintainer will automatically rebase it when it is merged to main. This avoid using CI resources unnecessarily. Thanks! |
Unreported flaky test detectedIf 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.webauthn.WebAuthnPropertyTest#requiredActionRegistrationKeycloak CI - WebAuthn IT (chrome) |
| rep.setDomains(ofNullable(organization.getDomains()).orElse(Stream.of()).collect(Collectors.mapping(ModelToRepresentation::toRepresentation, Collectors.toUnmodifiableSet()))); | ||
| rep.setIdentityProviders(ofNullable(organization.getIdentityProviders()).orElse(Stream.of()).collect(Collectors.mapping(provider -> toRepresentation(realm, provider), Collectors.toUnmodifiableList()))); | ||
| return rep; | ||
| } |
There was a problem hiding this comment.
I think we should leverage the methods in Organizations.java instead of having another set of toRepresentation methods.
There was a problem hiding this comment.
@sguilhen thank you for the review. Ok. I'll move that mapping into Organizations.java.
|
@mzvankovich Actually, put this on hold for a moment - I'm refactoring a few things to properly export/import the orgs (the whole thing about preserving the ids), and I'm moving some things around because the |
|
@mzvankovich I've crafted this PR: #33244 - once it gets merged you should be able to rebase this PR (and also the other one that adds the id to the token). The only change compared to your code is that the org rep doesn't include the idps by default, nor members. I don't think that should be a problem for the events as I personally would not include that info in the event - it makes the event more verbose and there's hardly any benefit in displaying the idps as the logged events have nothing to do with idps. We could add events from when idps are linked/unlinked to an org, similarly to what you did for members, linking the event to the idp tab of the org, but it could be worked on in a follow up PR. |
|
@mzvankovich I am not able to push changes to your PR, so I've cherry-picked your changes and opened another PR to replace this one: #33281 |
|
Closing in favor of #33281 |
Add organization admin crud events
Related #31421, #30180