Fix redirect bug

billoneil · billoneil · commit f5555034c14f · 2018-09-29T07:33:09.000-04:00
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/undertow/handlers/CustomHandlers.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/undertow/handlers/CustomHandlers.java
@@ -173,8 +173,8 @@ public static HttpHandler securityHeaders(HttpHandler next, ReferrerPolicy polic
     public static HttpHandler corsOriginWhitelist(HttpHandler next, Set<String> originWhitelist) {
         return exchange -> {
             String origin = Exchange.headers()
-                                  .getHeader(exchange, Headers.ORIGIN)
-                                  .orElse("");
+                                    .getHeader(exchange, Headers.ORIGIN)
+                                    .orElse("");
             log.debug("Origin: {} Whitelist: {}", origin, originWhitelist);
             if (originWhitelist.contains(origin)) {
                 log.debug("Origin whitelist matched adding CORS header");
diff --git a/stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/StubbornJavaWebApp.java b/stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/StubbornJavaWebApp.java
@@ -51,13 +51,13 @@ private static HttpHandler contentSecurityPolicy(HttpHandler delegate) {
 
     // {{start:middleware}}
     private static HttpHandler wrapWithMiddleware(HttpHandler next) {
-        return MiddlewareBuilder.begin(ex -> CustomHandlers.accessLog(ex, logger))
+        return MiddlewareBuilder.begin(CustomHandlers::gzip)
+                                .next(ex -> CustomHandlers.accessLog(ex, logger))
                                 .next(StubbornJavaWebApp::exceptionHandler)
                                 .next(CustomHandlers::statusCodeMetrics)
                                 .next(handler -> CustomHandlers.securityHeaders(handler, ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN))
                                 .next(StubbornJavaWebApp::contentSecurityPolicy)
-                                .next(CustomHandlers::gzip)
-                                .next(h -> CustomHandlers.corsOriginWhitelist(next, Sets.newHashSet("https://www.stubbornjava.com")))
+                                .next(h -> CustomHandlers.corsOriginWhitelist(h, Sets.newHashSet("https://www.stubbornjava.com")))
                                 .next(PageRoutes::redirector)
                                 .next(BlockingHandler::new)
                                 .complete(next);
