Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.uid2</groupId>
<artifactId>uid2-admin</artifactId>
<version>6.6.0</version>
<version>6.6.2-alpha-192-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -16,7 +16,7 @@
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
<micrometer.version>1.12.2</micrometer.version>
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<uid2-shared.version>10.4.0</uid2-shared.version>
<uid2-shared.version>10.5.0</uid2-shared.version>
<okta-jwt.version>0.5.10</okta-jwt.version>
<image.version>${project.version}</image.version>
</properties>
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/com/uid2/admin/vertx/AdminVerticle.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import com.uid2.admin.vertx.service.IService;
import com.uid2.shared.Const;
import com.uid2.shared.Utils;
import com.uid2.shared.audit.Audit;
import com.uid2.shared.audit.AuditParams;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.Promise;
import io.vertx.core.http.HttpServerOptions;
Expand Down Expand Up @@ -34,6 +36,7 @@ public class AdminVerticle extends AbstractVerticle {
private final TokenRefreshHandler tokenRefreshHandler;
private final IService[] services;
private final V2Router v2Router;
private final Audit audit;

public AdminVerticle(JsonObject config,
AuthProvider authProvider,
Expand All @@ -45,6 +48,7 @@ public AdminVerticle(JsonObject config,
this.tokenRefreshHandler = tokenRefreshHandler;
this.services = services;
this.v2Router = v2Router;
this.audit = new Audit("admin");
}

public void start(Promise<Void> startPromise) {
Expand Down Expand Up @@ -113,6 +117,16 @@ private void handleUserinfo(RoutingContext rc) {
List<String> groups = (List<String>) idJwt.getClaims().get("groups");
jo.put("groups", new JsonArray(groups));
jo.put("email", idJwt.getClaims().get("email"));

JsonObject userDetails = new JsonObject();
userDetails.put("email", idJwt.getClaims().get("email"));
userDetails.put("sub", idJwt.getClaims().get("sub"));
userDetails.put("path", "/login");

LOGGER.info("Authenticated user accessing admin page - User: {}", userDetails.toString());
rc.put("user_details", userDetails);
this.audit.log(rc, new AuditParams());

rc.response().setStatusCode(200).end(jo.toString());
} catch (Exception e) {
if (rc.session() != null) {
Expand Down