pac4j: remove double use of config

Author: jknack

modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/CallbackFilterImpl.java

@@ -5,8 +5,6 @@
  */
 package io.jooby.internal.pac4j;
 
-import org.pac4j.core.config.Config;
-
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
@@ -16,13 +14,10 @@
 
 public class CallbackFilterImpl implements Route.Handler {
 
-  private final Pac4jOptions options;
-
-  private final Config config;
+  private final Pac4jOptions config;
 
-  public CallbackFilterImpl(Config config, Pac4jOptions options) {
+  public CallbackFilterImpl(Pac4jOptions config) {
     this.config = config;
-    this.options = options;
   }
 
   @NonNull @Override
@@ -33,9 +28,9 @@ public Object apply(@NonNull Context ctx) throws Exception {
               .getCallbackLogic()
               .perform(
                   config,
-                  options.getDefaultUrl(),
-                  options.getRenewSession(),
-                  options.getDefaultClient(),
+                  config.getDefaultUrl(),
+                  config.getRenewSession(),
+                  config.getDefaultClient(),
                   Pac4jFrameworkParameters.create(ctx));
 
       return result == null ? ctx : result;

modules/jooby-pac4j/src/main/java/io/jooby/internal/pac4j/SecurityFilterImpl.java

@@ -12,7 +12,6 @@
 
 import org.pac4j.core.client.finder.ClientFinder;
 import org.pac4j.core.client.finder.DefaultSecurityClientFinder;
-import org.pac4j.core.config.Config;
 import org.pac4j.core.engine.DefaultSecurityLogic;
 import org.pac4j.core.engine.SecurityLogic;
 import org.pac4j.core.util.Pac4jConstants;
@@ -28,23 +27,16 @@ public class SecurityFilterImpl implements Route.Filter, Route.Handler {
 
   private final String pattern;
 
-  private final Config config;
-
-  private final Pac4jOptions options;
+  private final Pac4jOptions config;
 
   private final Supplier<String> clients;
 
   private String authorizers;
 
   public SecurityFilterImpl(
-      String pattern,
-      Config config,
-      Pac4jOptions options,
-      Supplier<String> clients,
-      List<String> authorizers) {
+      String pattern, Pac4jOptions config, Supplier<String> clients, List<String> authorizers) {
     this.pattern = pattern;
     this.config = config;
-    this.options = options;
     this.clients = clients;
     authorizers.forEach(this::addAuthorizer);
   }
@@ -61,10 +53,10 @@ public void addAuthorizer(String authorizer) {
   public Route.Handler apply(@NonNull Route.Handler next) {
     return ctx -> {
       if (pattern == null) {
-        return perform(ctx, new GrantAccessAdapterImpl(ctx, options, next));
+        return perform(ctx, new GrantAccessAdapterImpl(ctx, config, next));
       } else {
         if (ctx.matches(pattern)) {
-          return perform(ctx, new GrantAccessAdapterImpl(ctx, options, next));
+          return perform(ctx, new GrantAccessAdapterImpl(ctx, config, next));
         } else {
           return next.apply(ctx);
         }
@@ -74,7 +66,7 @@ public Route.Handler apply(@NonNull Route.Handler next) {
 
   @NonNull @Override
   public Object apply(@NonNull Context ctx) throws Exception {
-    return perform(ctx, new GrantAccessAdapterImpl(ctx, options));
+    return perform(ctx, new GrantAccessAdapterImpl(ctx, config));
   }
 
   private Object perform(Context ctx, GrantAccessAdapterImpl accessAdapter) {

modules/jooby-pac4j/src/main/java/io/jooby/pac4j/Pac4jModule.java

@@ -480,7 +480,7 @@ public void install(@NonNull Jooby app) throws Exception {
     }
     var direct = clients.getClients().stream().allMatch(it -> it instanceof DirectClient);
     if (!direct || options.isForceCallbackRoutes()) {
-      CallbackFilterImpl callbackFilter = new CallbackFilterImpl(options, options);
+      CallbackFilterImpl callbackFilter = new CallbackFilterImpl(options);
       app.get(options.getCallbackPath(), callbackFilter);
       app.post(options.getCallbackPath(), callbackFilter);
     }
@@ -501,7 +501,6 @@ public void install(@NonNull Jooby app) throws Exception {
               new SecurityFilterImpl(
                   null,
                   options,
-                  options,
                   lazyClientNameList(entry.getValue()),
                   clientMap.get(pattern).authorizers);
           app.get(pattern, securityFilter);
@@ -512,7 +511,6 @@ public void install(@NonNull Jooby app) throws Exception {
               new SecurityFilterImpl(
                   pattern,
                   options,
-                  options,
                   lazyClientNameList(entry.getValue()),
                   clientMap.get(pattern).authorizers));
         }
@@ -529,7 +527,6 @@ public void install(@NonNull Jooby app) throws Exception {
           new SecurityFilterImpl(
               null,
               options,
-              options,
               lazyClientNameList(defaultSecurityFilter),
               clientMap.get("*").authorizers));
     }