Initiate AuditParams() inside the middleware

Author: cYKatherine

src/main/java/com/uid2/optout/auth/InternalAuthMiddleware.java

@@ -65,14 +65,10 @@ public InternalAuthMiddleware(String internalApiToken, String auditSource) {
         this.audit = new Audit(auditSource);
     }
 
-    public Handler<RoutingContext> handleWithAudit(Handler<RoutingContext> handler, AuditParams auditParams, Boolean enableAuditLog) {
+    public Handler<RoutingContext> handleWithAudit(Handler<RoutingContext> handler) {
         InternalAuthHandler h;
-        if (enableAuditLog) {
-            final Handler<RoutingContext> loggedHandler = logAndHandle(handler, auditParams);
-            h = new InternalAuthHandler(loggedHandler, this.internalApiToken);
-        } else {
-            h = new InternalAuthHandler(handler, this.internalApiToken);
-        }
+        final Handler<RoutingContext> loggedHandler = logAndHandle(handler, new AuditParams());
+        h = new InternalAuthHandler(loggedHandler, this.internalApiToken);
         return h::handle;
     }
 }

src/main/java/com/uid2/optout/vertx/OptOutServiceVerticle.java

@@ -7,7 +7,6 @@
 import com.uid2.shared.attest.AttestationTokenService;
 import com.uid2.shared.attest.IAttestationTokenService;
 import com.uid2.shared.attest.JwtService;
-import com.uid2.shared.audit.AuditParams;
 import com.uid2.shared.auth.IAuthorizableProvider;
 import com.uid2.shared.auth.OperatorKey;
 import com.uid2.shared.auth.Role;
@@ -36,8 +35,8 @@
 import java.net.URL;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -58,7 +57,6 @@ public class OptOutServiceVerticle extends AbstractVerticle {
     private final AtomicReference<Collection<String>> cloudPaths = new AtomicReference<>();
     private final ICloudStorage cloudStorage;
     private final boolean enableOptOutPartnerMock;
-    private final boolean enableAuditLogging;
     private final String internalApiKey;
     private final InternalAuthMiddleware internalAuth;
 
@@ -88,8 +86,6 @@ public OptOutServiceVerticle(Vertx vertx,
         this.listenPort = Const.Port.ServicePortForOptOut + Utils.getPortOffset();
         this.deltaRotateInterval = jsonConfig.getInteger(Const.Config.OptOutDeltaRotateIntervalProp);
         this.isVerbose = jsonConfig.getBoolean(Const.Config.ServiceVerboseProp, false);
-        this.enableAuditLogging = true;
-
 
         String replicaUrisConfig = jsonConfig.getString(Const.Config.OptOutReplicaUris);
         if (replicaUrisConfig == null) {
@@ -170,11 +166,11 @@ private Router createRouter() {
                 .allowedHeader("Content-Type"));
 
         router.route(Endpoints.OPTOUT_WRITE.toString())
-                .handler(internalAuth.handleWithAudit(this::handleWrite, new AuditParams(), this.enableAuditLogging));
+                .handler(internalAuth.handleWithAudit(this::handleWrite));
         router.route(Endpoints.OPTOUT_REPLICATE.toString())
-                .handler(auth.handleWithAudit(this::handleReplicate, new AuditParams(), this.enableAuditLogging, Role.OPTOUT));
+                .handler(auth.handleWithAudit(this::handleReplicate, Arrays.asList(Role.OPTOUT)));
         router.route(Endpoints.OPTOUT_REFRESH.toString())
-                .handler(auth.handleWithAudit(attest.handle(this::handleRefresh, Role.OPERATOR), new AuditParams(), this.enableAuditLogging, Role.OPERATOR));
+                .handler(auth.handleWithAudit(attest.handle(this::handleRefresh, Role.OPERATOR), Arrays.asList(Role.OPERATOR)));
         router.get(Endpoints.OPS_HEALTHCHECK.toString())
                 .handler(this::handleHealthCheck);
 

src/test/java/com/uid2/optout/auth/InternalAuthMiddlewareTest.java

@@ -1,7 +1,6 @@
 package com.uid2.optout.auth;
 
 import org.junit.jupiter.api.BeforeEach;
-import com.uid2.shared.audit.AuditParams;
 import io.vertx.core.Handler;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.ext.web.RoutingContext;
@@ -34,7 +33,7 @@ public void setup(){
 
     @Test
     public void internalAuthHandlerNoAuthorizationHeader() {
-        Handler<RoutingContext> handler = internalAuth.handleWithAudit(nextHandler, new AuditParams(), true);
+        Handler<RoutingContext> handler = internalAuth.handleWithAudit(nextHandler);
         handler.handle(routingContext);
         verifyNoInteractions(nextHandler);
         verify(routingContext).fail(401);
@@ -43,7 +42,7 @@ public void internalAuthHandlerNoAuthorizationHeader() {
 
     @Test public void authHandlerInvalidAuthorizationHeader() {
         when(request.getHeader("Authorization")).thenReturn("Bogus Header Value");
-        Handler<RoutingContext> handler = internalAuth.handleWithAudit(nextHandler, new AuditParams(), true);
+        Handler<RoutingContext> handler = internalAuth.handleWithAudit(nextHandler);
         handler.handle(routingContext);
         verifyNoInteractions(nextHandler);
         verify(routingContext).fail(401);
@@ -52,7 +51,7 @@ public void internalAuthHandlerNoAuthorizationHeader() {
 
     @Test public void authHandlerUnknownKey() {
         when(request.getHeader("Authorization")).thenReturn("Bearer unknown-key");
-        Handler<RoutingContext> handler = internalAuth.handleWithAudit(nextHandler, new AuditParams(), true);
+        Handler<RoutingContext> handler = internalAuth.handleWithAudit(nextHandler);
         handler.handle(routingContext);
         verifyNoInteractions(nextHandler);
         verify(routingContext).fail(401);