diff --git a/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java b/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java index eb2dd22a3..df124bb17 100644 --- a/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java +++ b/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java @@ -233,23 +233,29 @@ public void start(Promise startPromise) throws Exception { } + private CorsHandler createCorsHandler() { + return CorsHandler.create() + .addRelativeOrigin(".*.") + .allowedMethod(io.vertx.core.http.HttpMethod.GET) + .allowedMethod(io.vertx.core.http.HttpMethod.POST) + .allowedMethod(io.vertx.core.http.HttpMethod.OPTIONS) + .allowedHeader(Const.Http.ClientVersionHeader) + .allowedHeader("Access-Control-Request-Method") + .allowedHeader("Access-Control-Allow-Credentials") + .allowedHeader("Access-Control-Allow-Origin") + .allowedHeader("Access-Control-Allow-Headers") + .allowedHeader("Content-Type"); + } + private Router createRoutesSetup() throws IOException { final Router router = Router.router(vertx); router.allowForward(AllowForwardHeaders.X_FORWARD); router.route().handler(new RequestCapturingHandler(siteProvider)); router.route().handler(new ClientVersionCapturingHandler("static/js", "*.js", clientKeyProvider)); - router.route().handler(CorsHandler.create() - .addRelativeOrigin(".*.") - .allowedMethod(io.vertx.core.http.HttpMethod.GET) - .allowedMethod(io.vertx.core.http.HttpMethod.POST) - .allowedMethod(io.vertx.core.http.HttpMethod.OPTIONS) - .allowedHeader(Const.Http.ClientVersionHeader) - .allowedHeader("Access-Control-Request-Method") - .allowedHeader("Access-Control-Allow-Credentials") - .allowedHeader("Access-Control-Allow-Origin") - .allowedHeader("Access-Control-Allow-Headers") - .allowedHeader("Content-Type")); + + router.route(V2_TOKEN_VALIDATE.toString()).handler(createCorsHandler().allowedHeader("Authorization")); + router.route().handler(createCorsHandler()); router.route().handler(new StatsCollectorHandler(_statsCollectorQueue, vertx)); router.route("/static/*").handler(StaticHandler.create("static")); router.route().handler(ctx -> {