Skip to content

Commit b4df16e

Browse files
committed
more fixes
1 parent 5d8faf4 commit b4df16e

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

src/main/java/org/pac4j/vertx/handler/impl/CallbackHandler.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.vertx.core.Vertx;
55
import io.vertx.ext.web.RoutingContext;
66
import lombok.val;
7+
import org.pac4j.core.adapter.FrameworkAdapter;
78
import org.pac4j.core.config.Config;
89
import org.pac4j.core.context.session.SessionStore;
910
import org.pac4j.core.engine.CallbackLogic;
@@ -47,6 +48,9 @@ public CallbackHandler(final Vertx vertx,
4748

4849
@Override
4950
public void handle(final RoutingContext rc) {
51+
52+
FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
53+
5054
val callbackLogic = config.getCallbackLogic();
5155

5256
vertx.<Void>executeBlocking(() -> {

src/main/java/org/pac4j/vertx/handler/impl/LogoutHandler.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.vertx.ext.web.RoutingContext;
66

77
import lombok.val;
8+
import org.pac4j.core.adapter.FrameworkAdapter;
89
import org.pac4j.core.config.Config;
910
import org.pac4j.core.context.session.SessionStore;
1011
import org.pac4j.core.engine.DefaultLogoutLogic;
@@ -59,6 +60,9 @@ public LogoutHandler(final Vertx vertx,
5960

6061
@Override
6162
public void handle(final RoutingContext rc) {
63+
64+
FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
65+
6266
val logoutLogic = config.getLogoutLogic();
6367

6468
vertx.<Void>executeBlocking(() -> {

src/main/java/org/pac4j/vertx/handler/impl/SecurityHandler.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.vertx.ext.web.handler.AuthenticationHandler;
66
import io.vertx.ext.web.impl.UserContextInternal;
77
import lombok.val;
8+
import org.pac4j.core.adapter.FrameworkAdapter;
89
import org.pac4j.core.config.Config;
910
import org.pac4j.core.context.WebContext;
1011
import org.pac4j.core.engine.*;
@@ -39,12 +40,15 @@ public SecurityHandler(final Vertx vertx,
3940

4041
@Override
4142
public void handle(final RoutingContext ctx) {
43+
44+
FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
45+
4246
val securityLogic = config.getSecurityLogic();
4347

4448
final SecurityGrantedAccessAdapter granted = (context, store, profiles) -> {
4549
final Pac4jUser user = new Pac4jUser(profiles);
4650

47-
((UserContextInternal) ctx.user()).setUser(user);
51+
((VertxWebContext) context).setVertxUser(user);
4852

4953
ctx.next();
5054
return null;

0 commit comments

Comments
 (0)