From 185c7830b01029ab38462574e8955b23fa26466d Mon Sep 17 00:00:00 2001 From: Tom Dooner Date: Thu, 10 Aug 2023 15:50:46 -0700 Subject: [PATCH] Prevent split-flow in laterdocs also Co-authored-by: Arin Choi --- .../app/interceptor/DataRequiredInterceptor.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/homeschoolpebt/app/interceptor/DataRequiredInterceptor.java b/src/main/java/org/homeschoolpebt/app/interceptor/DataRequiredInterceptor.java index 2399a1ee..1bee7c25 100644 --- a/src/main/java/org/homeschoolpebt/app/interceptor/DataRequiredInterceptor.java +++ b/src/main/java/org/homeschoolpebt/app/interceptor/DataRequiredInterceptor.java @@ -93,7 +93,11 @@ public class DataRequiredInterceptor implements HandlerInterceptor { Map.entry("submitting", "firstName"), Map.entry("legalStuff", "firstName"), Map.entry("signName", "firstName"), - Map.entry("success", "firstName") + Map.entry("success", "firstName"), + + // docUpload flow + Map.entry("uploadDocuments", "firstName"), + Map.entry("docUploadConfirm", "firstName") ); public DataRequiredInterceptor(SubmissionRepositoryService submissionRepositoryService) { @@ -104,8 +108,8 @@ public DataRequiredInterceptor(SubmissionRepositoryService submissionRepositoryS public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { try { var parsedUrl = new AntPathMatcher().extractUriTemplateVariables(PATH_FORMAT, request.getRequestURI()); - if (!parsedUrl.get("flow").equals("pebt")) { - return true; // Only enforce data requirements in PEBT flow. + if (!parsedUrl.get("flow").equals("pebt") && !parsedUrl.get("flow").equals("docUpload")) { + return true; } var requiredData = REQUIRED_DATA.get(parsedUrl.get("screen")); if (requiredData == null) {