diff --git a/application/src/main/java/run/halo/app/security/preauth/PreAuthEmailPasswordResetEndpoint.java b/application/src/main/java/run/halo/app/security/preauth/PreAuthEmailPasswordResetEndpoint.java index 55c40d5d10..afa9fed61a 100644 --- a/application/src/main/java/run/halo/app/security/preauth/PreAuthEmailPasswordResetEndpoint.java +++ b/application/src/main/java/run/halo/app/security/preauth/PreAuthEmailPasswordResetEndpoint.java @@ -18,6 +18,8 @@ import lombok.Data; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpRequest; @@ -55,6 +57,7 @@ public PreAuthEmailPasswordResetEndpoint( } @Bean + @Order(Ordered.HIGHEST_PRECEDENCE + 100) RouterFunction preAuthPasswordResetEndpoints( GlobalInfoService globalInfoService, PasswordResetAvailabilityProviders availabilityProviders, diff --git a/application/src/main/java/run/halo/app/security/preauth/PreAuthLoginEndpoint.java b/application/src/main/java/run/halo/app/security/preauth/PreAuthLoginEndpoint.java index 4905ae2c2b..4e7fc1954b 100644 --- a/application/src/main/java/run/halo/app/security/preauth/PreAuthLoginEndpoint.java +++ b/application/src/main/java/run/halo/app/security/preauth/PreAuthLoginEndpoint.java @@ -8,6 +8,8 @@ import java.util.Optional; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Bean; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.security.web.server.savedrequest.ServerRequestCache; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.server.RouterFunction; @@ -53,6 +55,7 @@ class PreAuthLoginEndpoint { } @Bean + @Order(Ordered.HIGHEST_PRECEDENCE + 100) RouterFunction preAuthLoginEndpoints() { return RouterFunctions.nest(path("/login"), RouterFunctions.route() .GET("", request -> { diff --git a/application/src/main/java/run/halo/app/security/preauth/PreAuthSignUpEndpoint.java b/application/src/main/java/run/halo/app/security/preauth/PreAuthSignUpEndpoint.java index 57595adc84..62ab62ed03 100644 --- a/application/src/main/java/run/halo/app/security/preauth/PreAuthSignUpEndpoint.java +++ b/application/src/main/java/run/halo/app/security/preauth/PreAuthSignUpEndpoint.java @@ -14,6 +14,8 @@ import java.net.URI; import lombok.Data; import org.springframework.context.annotation.Bean; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; @@ -67,6 +69,7 @@ class PreAuthSignUpEndpoint { } @Bean + @Order(Ordered.HIGHEST_PRECEDENCE + 100) RouterFunction preAuthSignUpEndpoints() { return RouterFunctions.nest(path("/signup"), RouterFunctions.route() .GET("", request -> { diff --git a/application/src/main/java/run/halo/app/security/preauth/PreAuthTwoFactorEndpoint.java b/application/src/main/java/run/halo/app/security/preauth/PreAuthTwoFactorEndpoint.java index 6f5c75e04a..ebf3d551bc 100644 --- a/application/src/main/java/run/halo/app/security/preauth/PreAuthTwoFactorEndpoint.java +++ b/application/src/main/java/run/halo/app/security/preauth/PreAuthTwoFactorEndpoint.java @@ -2,6 +2,8 @@ import java.util.Map; import org.springframework.context.annotation.Bean; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; @@ -19,6 +21,7 @@ class PreAuthTwoFactorEndpoint { @Bean + @Order(Ordered.HIGHEST_PRECEDENCE + 100) RouterFunction preAuthTwoFactorEndpoints(GlobalInfoService globalInfoService) { return RouterFunctions.route() .GET("/challenges/two-factor/totp", diff --git a/application/src/main/java/run/halo/app/security/preauth/SystemSetupEndpoint.java b/application/src/main/java/run/halo/app/security/preauth/SystemSetupEndpoint.java index cbf2d8f365..ab4d7718f4 100644 --- a/application/src/main/java/run/halo/app/security/preauth/SystemSetupEndpoint.java +++ b/application/src/main/java/run/halo/app/security/preauth/SystemSetupEndpoint.java @@ -30,6 +30,8 @@ import org.springframework.beans.factory.config.PlaceholderConfigurerSupport; import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails; import org.springframework.context.annotation.Bean; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import org.springframework.core.io.ClassPathResource; import org.springframework.dao.OptimisticLockingFailureException; import org.springframework.http.HttpStatus; @@ -86,6 +88,7 @@ public class SystemSetupEndpoint { private final ObjectProvider connectionDetails; @Bean + @Order(Ordered.HIGHEST_PRECEDENCE + 100) RouterFunction setupPageRouter() { final var tag = "SystemV1alpha1Public"; return SpringdocRouteBuilder.route()