Skip to content

Commit

Permalink
#66 Use the original admin event authentication context to get realm (#…
Browse files Browse the repository at this point in the history
…68)

original extAuthDetails are null in ExtendedAdminEvent

logic here seems a bit wrong:
public ExtendedAdminEvent(String uid, AdminEvent event, RealmModel realm) {
.....
    setAuthDetails(event.getAuthDetails());
    extAuthDetails.setRealmId(realm.getName());
....
}

we are basically overidding the realm of the original AuthDetails with the realm in which the event is triggered
  • Loading branch information
rtufisi authored Aug 15, 2024
1 parent ec882dd commit 8c090bd
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,15 @@ private ExtendedAdminEvent completeAdminEventAttributes(String uid, Event event)
}

private ExtendedAdminEvent completeAdminEventAttributes(String uid, AdminEvent adminEvent) {
RealmModel realm = session.realms().getRealm(adminEvent.getRealmId());
RealmModel realm = session.realms().getRealm(adminEvent.getAuthDetails().getRealmId());
ExtendedAdminEvent extendedAdminEvent = new ExtendedAdminEvent(uid, adminEvent, realm);
// add always missing agent username
ExtendedAuthDetails extendedAuthDetails = extendedAdminEvent.getAuthDetails();
if (!Strings.isNullOrEmpty(extendedAuthDetails.getUserId())) {
UserModel user = session.users().getUserById(realm, extendedAuthDetails.getUserId());
extendedAuthDetails.setUsername(user.getUsername());
}

// add username if resource is a user
String resourcePath = extendedAdminEvent.getResourcePath();
if (resourcePath != null && resourcePath.startsWith("users")) {
Expand Down

0 comments on commit 8c090bd

Please sign in to comment.