pac4j: upgrade to 6.x

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

@@ -5,12 +5,13 @@
  */
 package io.jooby.internal.pac4j;
 
+import org.pac4j.core.adapter.FrameworkAdapter;
 import org.pac4j.core.config.Config;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
-import io.jooby.pac4j.Pac4jContext;
+import io.jooby.pac4j.Pac4jFrameworkParameters;
 import io.jooby.pac4j.Pac4jOptions;
 
 public class CallbackFilterImpl implements Route.Handler {
@@ -26,19 +27,16 @@ public CallbackFilterImpl(Config config, Pac4jOptions options) {
 
   @NonNull @Override
   public Object apply(@NonNull Context ctx) throws Exception {
-    Pac4jContext pac4j = Pac4jContext.create(ctx);
-
-    Object result =
+    FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
+    var result =
         config
             .getCallbackLogic()
             .perform(
-                pac4j,
-                pac4j.getSessionStore(),
                 config,
-                config.getHttpActionAdapter(),
                 options.getDefaultUrl(),
-                options.getSaveInSession(),
-                options.getDefaultClient());
+                options.getRenewSession(),
+                options.getDefaultClient(),
+                Pac4jFrameworkParameters.create(ctx));
 
     return result == null ? ctx : result;
   }

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

@@ -0,0 +1,23 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.internal.pac4j;
+
+import org.pac4j.core.context.FrameworkParameters;
+import org.pac4j.core.context.WebContext;
+import org.pac4j.core.context.WebContextFactory;
+
+import io.jooby.pac4j.Pac4jContext;
+import io.jooby.pac4j.Pac4jFrameworkParameters;
+
+public class ContextFactoryImpl implements WebContextFactory {
+  @Override
+  public WebContext newContext(FrameworkParameters parameters) {
+    if (parameters instanceof Pac4jFrameworkParameters params) {
+      return Pac4jContext.create(params.getContext());
+    }
+    throw new IllegalArgumentException("Can't create context from: " + parameters);
+  }
+}

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

@@ -6,41 +6,60 @@
 package io.jooby.internal.pac4j;
 
 import java.util.Collection;
-import java.util.Iterator;
 
 import org.pac4j.core.context.WebContext;
 import org.pac4j.core.context.session.SessionStore;
 import org.pac4j.core.engine.SecurityGrantedAccessAdapter;
+import org.pac4j.core.exception.http.WithLocationAction;
 import org.pac4j.core.profile.UserProfile;
+import org.pac4j.core.util.Pac4jConstants;
 
 import io.jooby.Context;
 import io.jooby.Route;
-import io.jooby.pac4j.Pac4jContext;
+import io.jooby.SneakyThrows;
+import io.jooby.pac4j.Pac4jOptions;
 
 public class GrantAccessAdapterImpl implements SecurityGrantedAccessAdapter {
   private final Context ctx;
-  private final Route.Handler next;
+  private final Pac4jOptions config;
+  private final SneakyThrows.Function2<WebContext, SessionStore, Object> next;
 
-  public GrantAccessAdapterImpl(Context ctx, Route.Handler next) {
+  public GrantAccessAdapterImpl(Context ctx, Pac4jOptions config) {
+    this(
+        ctx,
+        config,
+        (context, sessionStore) -> {
+          var requestedUrl =
+              sessionStore
+                  .get(context, Pac4jConstants.REQUESTED_URL)
+                  .filter(WithLocationAction.class::isInstance)
+                  .map(it -> ((WithLocationAction) it).getLocation())
+                  .orElse(config.getDefaultUrl());
+          return ctx.sendRedirect(requestedUrl);
+        });
+  }
+
+  public GrantAccessAdapterImpl(Context ctx, Pac4jOptions config, Route.Handler next) {
+    this(ctx, config, (context, sessionStore) -> next.apply(ctx));
+  }
+
+  private GrantAccessAdapterImpl(
+      Context ctx,
+      Pac4jOptions config,
+      SneakyThrows.Function2<WebContext, SessionStore, Object> next) {
     this.ctx = ctx;
+    this.config = config;
     this.next = next;
   }
 
   @Override
   public Object adapt(
-      WebContext webContext,
-      SessionStore sessionStore,
-      Collection<UserProfile> profiles,
-      Object... objects)
+      WebContext context, SessionStore sessionStore, Collection<UserProfile> profiles)
       throws Exception {
-    Iterator<UserProfile> iterator = profiles.iterator();
+    var iterator = profiles.iterator();
     if (iterator.hasNext()) {
-      ((Pac4jContext) webContext).getContext().setUser(iterator.next());
+      ctx.setUser(iterator.next());
     }
-    return next.apply(ctx);
-  }
-
-  public static GrantAccessAdapterImpl redirect(Context context, String redirectTo) {
-    return new GrantAccessAdapterImpl(context, ctx -> ctx.sendRedirect(redirectTo));
+    return next.apply(context, sessionStore);
   }
 }

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

@@ -5,12 +5,13 @@
  */
 package io.jooby.internal.pac4j;
 
+import org.pac4j.core.adapter.FrameworkAdapter;
 import org.pac4j.core.config.Config;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
-import io.jooby.pac4j.Pac4jContext;
+import io.jooby.pac4j.Pac4jFrameworkParameters;
 import io.jooby.pac4j.Pac4jOptions;
 
 public class LogoutImpl implements Route.Handler {
@@ -26,23 +27,21 @@ public LogoutImpl(Config config, Pac4jOptions options) {
 
   @NonNull @Override
   public Object apply(@NonNull Context ctx) throws Exception {
-    String redirectTo = (String) ctx.getAttributes().get("pac4j.logout.redirectTo");
-    if (redirectTo == null || redirectTo.length() == 0) {
+    FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
+    var redirectTo = (String) ctx.getAttributes().get("pac4j.logout.redirectTo");
+    if (redirectTo == null || redirectTo.isEmpty()) {
       redirectTo = options.getDefaultUrl();
     }
     redirectTo = ctx.getRequestURL(redirectTo);
-    Pac4jContext pac4jContext = Pac4jContext.create(ctx);
     return config
         .getLogoutLogic()
         .perform(
-            pac4jContext,
-            pac4jContext.getSessionStore(),
             config,
-            config.getHttpActionAdapter(),
             redirectTo,
-            null,
+            options.getLogoutUrlPattern(),
             options.isLocalLogout(),
             options.isDestroySession(),
-            options.isCentralLogout());
+            options.isCentralLogout(),
+            Pac4jFrameworkParameters.create(ctx));
   }
 }

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

@@ -8,18 +8,24 @@
 import java.util.function.Function;
 
 import org.pac4j.core.config.Config;
-import org.pac4j.core.profile.ProfileManager;
 
 import io.jooby.Context;
 import io.jooby.pac4j.Pac4jContext;
 
 public class Pac4jCurrentUser implements Function<Context, Object> {
 
+  private final Config config;
+
+  public Pac4jCurrentUser(Config config) {
+    this.config = config;
+  }
+
   @Override
   public Object apply(Context ctx) {
-    Pac4jContext pac4jContext = Pac4jContext.create(ctx);
-    ProfileManager pm = new ProfileManager(pac4jContext, pac4jContext.getSessionStore());
-    pm.setConfig(ctx.require(Config.class));
-    return pm.getProfile().orElse(null);
+    var pmf = config.getProfileManagerFactory();
+    var pac4jContext = Pac4jContext.create(ctx);
+    var pm = pmf.apply(pac4jContext, pac4jContext.getSessionStore());
+    var profile = pm.getProfile().orElse(null);
+    return profile;
   }
 }

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

@@ -7,26 +7,24 @@
 
 import java.util.Set;
 
-import org.pac4j.core.context.WebContext;
-import org.pac4j.core.context.session.SessionStore;
+import org.pac4j.core.context.CallContext;
 import org.pac4j.core.engine.savedrequest.DefaultSavedRequestHandler;
 
-import io.jooby.Context;
 import io.jooby.pac4j.Pac4jContext;
 
 public class SavedRequestHandlerImpl extends DefaultSavedRequestHandler {
-  private Set<String> excludes;
+  private final Set<String> excludes;
 
   public SavedRequestHandlerImpl(Set<String> excludes) {
     this.excludes = excludes;
   }
 
   @Override
-  public void save(WebContext webContext, SessionStore sessionStore) {
-    Pac4jContext pac4j = (Pac4jContext) webContext;
-    Context context = pac4j.getContext();
+  public void save(CallContext ctx) {
+    var pac4j = (Pac4jContext) ctx.webContext();
+    var context = pac4j.getContext();
     if (!excludes.contains(context.getRequestPath())) {
-      super.save(webContext, sessionStore);
+      super.save(ctx);
     }
   }
 }

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

@@ -10,29 +10,29 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import org.pac4j.core.adapter.FrameworkAdapter;
 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.exception.http.WithLocationAction;
 import org.pac4j.core.util.Pac4jConstants;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
-import io.jooby.pac4j.Pac4jContext;
+import io.jooby.pac4j.Pac4jFrameworkParameters;
 import io.jooby.pac4j.Pac4jOptions;
 
 public class SecurityFilterImpl implements Route.Filter, Route.Handler {
 
-  private String pattern;
+  private final String pattern;
 
-  private Config config;
+  private final Config config;
 
-  private Pac4jOptions options;
+  private final Pac4jOptions options;
 
-  private Supplier<String> clients;
+  private final Supplier<String> clients;
 
   private String authorizers;
 
@@ -61,10 +61,10 @@ public void addAuthorizer(String authorizer) {
   public Route.Handler apply(@NonNull Route.Handler next) {
     return ctx -> {
       if (pattern == null) {
-        return perform(Pac4jContext.create(ctx), new GrantAccessAdapterImpl(ctx, next));
+        return perform(ctx, new GrantAccessAdapterImpl(ctx, options, next));
       } else {
         if (ctx.matches(pattern)) {
-          return perform(Pac4jContext.create(ctx), new GrantAccessAdapterImpl(ctx, next));
+          return perform(ctx, new GrantAccessAdapterImpl(ctx, options, next));
         } else {
           return next.apply(ctx);
         }
@@ -74,32 +74,16 @@ public Route.Handler apply(@NonNull Route.Handler next) {
 
   @NonNull @Override
   public Object apply(@NonNull Context ctx) throws Exception {
-    Pac4jContext pac4j = Pac4jContext.create(ctx);
-    String requestedUrl =
-        (String)
-            pac4j
-                .getSessionStore()
-                .get(pac4j, Pac4jConstants.REQUESTED_URL)
-                .filter(WithLocationAction.class::isInstance)
-                .map(it -> ((WithLocationAction) it).getLocation())
-                .orElse(options.getDefaultUrl());
-    return perform(pac4j, GrantAccessAdapterImpl.redirect(ctx, requestedUrl));
+    return perform(ctx, new GrantAccessAdapterImpl(ctx, options));
   }
 
-  private Object perform(Pac4jContext ctx, GrantAccessAdapterImpl grantAccessAdapter) {
-    SecurityLogic securityLogic = config.getSecurityLogic();
-    String clients = ctx.getContext().query(clientName(securityLogic)).value(this.clients.get());
-    String authorizers = ofNullable(this.authorizers).orElse(NoopAuthorizer.NAME);
+  private Object perform(Context ctx, GrantAccessAdapterImpl accessAdapter) throws Exception {
+    FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
+    var securityLogic = config.getSecurityLogic();
+    var clients = ctx.lookup(clientName(securityLogic)).value(this.clients.get());
+    var authorizers = ofNullable(this.authorizers).orElse(NoopAuthorizer.NAME);
     return securityLogic.perform(
-        ctx,
-        ctx.getSessionStore(),
-        config,
-        grantAccessAdapter,
-        config.getHttpActionAdapter(),
-        clients,
-        authorizers,
-        null,
-        options.getMultiProfile());
+        config, accessAdapter, clients, authorizers, null, Pac4jFrameworkParameters.create(ctx));
   }
 
   private String clientName(SecurityLogic securityLogic) {

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

@@ -0,0 +1,22 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.internal.pac4j;
+
+import org.pac4j.core.context.FrameworkParameters;
+import org.pac4j.core.context.session.SessionStore;
+import org.pac4j.core.context.session.SessionStoreFactory;
+
+import io.jooby.pac4j.Pac4jContext;
+
+public class SessionStoreFactoryImpl implements SessionStoreFactory {
+  @Override
+  public SessionStore newSessionStore(FrameworkParameters parameters) {
+    if (parameters instanceof Pac4jContext ctx) {
+      return ctx.getSessionStore();
+    }
+    return new SessionStoreImpl();
+  }
+}

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

@@ -35,7 +35,7 @@ public WebContextImpl(Context context) {
   }
 
   @Override
-  public Context getContext() {
+  public @NonNull Context getContext() {
     return context;
   }