Added tests for combinations and fixes.

Signed-off-by: Paulo Lopes <[email protected]>

vertx-web/src/main/java/io/vertx/ext/web/handler/impl/AuthenticationHandlerImpl.java

@@ -170,7 +170,7 @@ private boolean handlePreflight(RoutingContext ctx) {
     return false;
   }
 
-  private AuthenticationProvider getAuthProvider(RoutingContext ctx) {
+  protected AuthenticationProvider getAuthProvider(RoutingContext ctx) {
     try {
       AuthenticationProvider provider = ctx.get(AUTH_PROVIDER_CONTEXT_KEY);
       if (provider != null) {

vertx-web/src/main/java/io/vertx/ext/web/handler/impl/ChainAuthHandlerImpl.java

@@ -101,7 +101,7 @@ private void iterate(final int idx, final RoutingContext ctx, JsonObject result,
 
       // setup the desired auth provider if we can
       if (authHandler instanceof AuthenticationHandlerImpl) {
-        ctx.put(AuthenticationHandlerImpl.AUTH_PROVIDER_CONTEXT_KEY, ((AuthenticationHandlerImpl) authHandler).authProvider);
+        ctx.put(AuthenticationHandlerImpl.AUTH_PROVIDER_CONTEXT_KEY, ((AuthenticationHandlerImpl) authHandler).getAuthProvider(ctx));
       }
 
       if (all) {

vertx-web/src/test/java/io/vertx/ext/web/handler/ChainAuthMixHandlerTest.java

@@ -0,0 +1,73 @@
+package io.vertx.ext.web.handler;
+
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Future;
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.WebTestBase;
+import io.vertx.ext.web.handler.impl.AuthenticationHandlerImpl;
+import io.vertx.ext.web.handler.impl.HttpStatusException;
+import io.vertx.ext.web.sstore.LocalSessionStore;
+import org.junit.Test;
+
+public class ChainAuthMixHandlerTest extends WebTestBase {
+
+  private AuthenticationHandler success = new AuthenticationHandlerImpl((authInfo, resultHandler) -> resultHandler.handle(Future.succeededFuture(User.create(new JsonObject())))) {
+    @Override
+    public void parseCredentials(RoutingContext context, Handler<AsyncResult<JsonObject>> handler) {
+      handler.handle(Future.succeededFuture(new JsonObject()));
+    }
+  };
+
+  private AuthenticationHandler failure = new AuthenticationHandlerImpl((authInfo, resultHandler) -> resultHandler.handle(Future.failedFuture("Oops!"))) {
+    @Override
+    public void parseCredentials(RoutingContext context, Handler<AsyncResult<JsonObject>> handler) {
+      handler.handle(Future.failedFuture(new HttpStatusException(401)));
+    }
+  };
+
+  @Test
+  public void testFailOrFailOrSuccess() throws Exception {
+
+    // (failure OR (failure OR success))
+    ChainAuthHandler chain =
+      ChainAuthHandler.any()
+        .add(failure)
+        .add(
+          ChainAuthHandler.any()
+            .add(failure)
+            .add(success)
+        );
+
+
+    router.route().handler(SessionHandler.create(LocalSessionStore.create(vertx)));
+    router.route().handler(chain);
+    router.route().handler(ctx -> ctx.response().end());
+
+    testRequest(HttpMethod.GET, "/", 200, "OK");
+  }
+
+  @Test
+  public void testFailOrSuccessAndFail() throws Exception {
+
+    // (failure OR (sucess AND failure))
+    ChainAuthHandler chain =
+      ChainAuthHandler.any()
+        .add(failure)
+        .add(
+          ChainAuthHandler.all()
+            .add(success)
+            .add(failure)
+        );
+
+
+    router.route().handler(SessionHandler.create(LocalSessionStore.create(vertx)));
+    router.route().handler(chain);
+    router.route().handler(ctx -> ctx.response().end());
+
+    testRequest(HttpMethod.GET, "/", 401, "Unauthorized");
+  }
+}