Add audit logging to handleUserInfo

Author: cYKatherine

src/main/java/com/uid2/admin/auth/OktaAuthProvider.java

@@ -1,15 +1,11 @@
 package com.uid2.admin.auth;
 
 import com.okta.jwt.IdTokenVerifier;
-import com.uid2.shared.audit.Audit;
-import com.uid2.shared.audit.AuditParams;
-import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.oauth2.OAuth2Auth;
 import io.vertx.ext.auth.oauth2.OAuth2Options;
 import io.vertx.ext.web.Route;
-import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.AuthenticationHandler;
 import io.vertx.ext.web.handler.OAuth2AuthHandler;
 import com.okta.jwt.AccessTokenVerifier;
@@ -28,11 +24,9 @@ public class OktaAuthProvider implements AuthProvider {
     private final List<String> scopes = List.of("openid", "email", "uid2.admin.human");
     private final AccessTokenVerifier accessTokenVerifier;
     private final IdTokenVerifier idTokenVerifier;
-    private final Audit audit;
 
     public OktaAuthProvider(JsonObject config) {
         this.config = config;
-        this.audit = new Audit(OktaAuthProvider.class.getPackage().getName());
         if(isAuthDisabled(config)) {
             this.accessTokenVerifier = null;
             this.idTokenVerifier = null;
@@ -72,12 +66,6 @@ public AuthenticationHandler createAuthHandler(Vertx vertx, Route callbackRoute)
         );
         OAuth2AuthHandler authHandler = OAuth2AuthHandler.create(vertx, oktaAuth, this.config.getString(OKTA_CALLBACK));
         authHandler.extraParams(new JsonObject(String.format("{\"scope\":\"%s\"}", String.join(" ", this.scopes))));
-        callbackRoute.handler(ctx -> {
-            System.out.println("AUDIT START - Path: " + ctx.request().path());
-            System.out.println("Query: " + ctx.request().query());
-            this.audit.log(ctx, new AuditParams());
-            ctx.next();
-        });
         authHandler.setupCallback(callbackRoute);
         return authHandler;
     }

src/main/java/com/uid2/admin/vertx/AdminVerticle.java

@@ -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;
@@ -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,
@@ -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) {
@@ -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) {