2024-11-19 - Correction to regex on homecontroller-external

Author: Luch76

server/src/main/java/com/objectcomputing/checkins/security/HomeExternalRecipientController.java

@@ -30,7 +30,7 @@ public HomeExternalRecipientController(Environment environment) {
         this.environment = environment;
     }
 
-    @Get("/externalFeedback/{path:.+}")
+    @Get("/externalFeedback/{path:([^\\.]+)$}")
     public Optional<StreamedFile> forward(String path) {
         LOG.info("HomeExternalRecipientController, forward, path: " + path);
         return environment.getResource("public-external-feedback/index.html").map(StreamedFile::new);

server/src/main/java/com/objectcomputing/checkins/services/feedback_answer/FeedbackAnswerServicesImpl.java

@@ -5,6 +5,7 @@
 import com.objectcomputing.checkins.exceptions.PermissionException;
 import com.objectcomputing.checkins.services.feedback_request.FeedbackRequest;
 import com.objectcomputing.checkins.services.feedback_request.FeedbackRequestServices;
+import com.objectcomputing.checkins.services.feedback_template.template_question.TemplateQuestion;
 import com.objectcomputing.checkins.services.feedback_template.template_question.TemplateQuestionServices;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
@@ -43,9 +44,10 @@ public FeedbackAnswerServicesImpl(FeedbackAnswerRepository feedbackAnswerReposit
 
     @Override
     public FeedbackAnswer save(FeedbackAnswer feedbackAnswer) {
+        UUID questionId = feedbackAnswer.getQuestionId();
 
         // Ensure that related question exists
-        templateQuestionServices.getById(feedbackAnswer.getQuestionId());
+        TemplateQuestion templateQuestion = templateQuestionServices.getById(questionId);
 
         FeedbackRequest relatedFeedbackRequest = getRelatedFeedbackRequest(feedbackAnswer);
         if (!createIsPermitted(relatedFeedbackRequest)) {

server/src/main/java/com/objectcomputing/checkins/services/feedback_template/template_question/TemplateQuestionServicesImpl.java

@@ -157,7 +157,9 @@ public boolean getIsPermitted(UUID templateId) {
         UUID currentUserId;
         MemberProfile currentUser;
 
-        final Optional<FeedbackTemplate> feedbackTemplate = feedbackTemplateRepo.findById(templateId);
+        final Optional<FeedbackTemplate> feedbackTemplateOptional = feedbackTemplateRepo.findById(templateId);
+        FeedbackTemplate feedbackTemplate;
+        feedbackTemplate = feedbackTemplateOptional.orElse(null);
 
         try {
             currentUser = currentUserServices.getCurrentUser();
@@ -167,7 +169,12 @@ public boolean getIsPermitted(UUID templateId) {
             currentUserId = null;
         }
 
-        return (currentUserId != null || (feedbackTemplate != null && feedbackTemplate.isPresent() && feedbackTemplate.get().getIsForExternalRecipient() != null && feedbackTemplate.get().getIsForExternalRecipient() == true));
+        if (currentUserId != null) return true;
+
+        boolean templateForExternalRecipient = (feedbackTemplate != null && feedbackTemplate.getIsForExternalRecipient() == true);
+        if (templateForExternalRecipient) return true;
+
+        return false;
     }
 
 }

web-ui-external-feedback/index.html

@@ -41,8 +41,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-
     <script type="module" src="/src/index.jsx"></script>
-
   </body>
 </html>