refactor: head tag injection to skip error pages

halo-dev · Sep 26, 2024 · 27060ee · 27060ee
1 parent f6409a0
commit 27060ee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/...ion/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java b/...ion/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java
@@ -7,13 +7,16 @@
 import org.springframework.boot.web.reactive.error.DefaultErrorAttributes;
 import org.springframework.context.MessageSource;
 import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.server.ServerWebExchange;
 
 /**
  * See {@link DefaultErrorAttributes} for more.
  *
  * @author johnn
  */
 public class ProblemDetailErrorAttributes extends DefaultErrorAttributes {
+    public static final String ERROR_INTERNAL_ATTRIBUTE =
+        ProblemDetailErrorAttributes.class.getName() + ".ERROR";
 
     private final MessageSource messageSource;
 
@@ -31,4 +34,9 @@ public Map<String, Object> getErrorAttributes(ServerRequest request,
         return errAttributes;
     }
 
+    @Override
+    public void storeErrorInformation(Throwable error, ServerWebExchange exchange) {
+        super.storeErrorInformation(error, exchange);
+        exchange.getAttributes().putIfAbsent(ERROR_INTERNAL_ATTRIBUTE, error);
+    }
 }
diff --git a/application/src/main/java/run/halo/app/theme/dialect/GlobalHeadInjectionProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/GlobalHeadInjectionProcessor.java
@@ -9,6 +9,7 @@
 import org.thymeleaf.processor.element.IElementModelStructureHandler;
 import org.thymeleaf.templatemode.TemplateMode;
 import reactor.core.publisher.Flux;
+import run.halo.app.infra.exception.handlers.ProblemDetailErrorAttributes;
 import run.halo.app.plugin.extensionpoint.ExtensionGetter;
 
 /**
@@ -43,6 +44,12 @@ public GlobalHeadInjectionProcessor(final String dialectPrefix) {
     protected void doProcess(ITemplateContext context, IModel model,
         IElementModelStructureHandler structureHandler) {
 
+        var error = context.getVariable(ProblemDetailErrorAttributes.ERROR_INTERNAL_ATTRIBUTE);
+        if (error != null) {
+            // do not process for error page
+            return;
+        }
+
         // note that this is important!!
         Object processedAlready = context.getVariable(PROCESS_FLAG);
         if (processedAlready != null) {

diff --git a/application/src/main/java/run/halo/app/theme/dialect/TemplateFooterElementTagProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/TemplateFooterElementTagProcessor.java
@@ -13,6 +13,7 @@
 import reactor.core.publisher.Flux;
 import run.halo.app.infra.SystemConfigurableEnvironmentFetcher;
 import run.halo.app.infra.SystemSetting;
+import run.halo.app.infra.exception.handlers.ProblemDetailErrorAttributes;
 import run.halo.app.plugin.extensionpoint.ExtensionGetter;
 
 /**
@@ -48,6 +49,12 @@ public TemplateFooterElementTagProcessor(final String dialectPrefix) {
     protected void doProcess(ITemplateContext context, IProcessableElementTag tag,
         IElementTagStructureHandler structureHandler) {
 
+        var error = context.getVariable(ProblemDetailErrorAttributes.ERROR_INTERNAL_ATTRIBUTE);
+        if (error != null) {
+            // do not process for error page
+            return;
+        }
+
         IModel modelToInsert = context.getModelFactory().createModel();
         /*
          * Obtain the Spring application context.