fix: make sure background threads check for not logged in current user (

#16402) * fix: make sure background threads check for null/not logged in current user
dhis2 · Feb 6, 2024 · a9f65d5 · a9f65d5
1 parent 7c5bce7
commit a9f65d5
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 10 deletions.
diff --git a/...services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java b/...services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java
@@ -109,7 +109,7 @@ public class DefaultMessageService implements MessageService {
   @Override
   @Transactional
   public long sendTicketMessage(String subject, String text, String metaData) {
-    User currentUser = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User currentUser = getCurrentUserOrNull();
 
     MessageConversationParams params =
         new MessageConversationParams.Builder()
@@ -133,7 +133,7 @@ public long sendPrivateMessage(
       String text,
       String metaData,
       Set<FileResource> attachments) {
-    User currentUser = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User currentUser = getCurrentUserOrNull();
 
     MessageConversationParams params =
         new MessageConversationParams.Builder()
@@ -215,7 +215,13 @@ public long sendMessage(MessageConversationParams params, UserDetails actingUser
   @Override
   @Transactional
   public long sendMessage(MessageConversationParams params) {
-    return sendMessage(params, CurrentUserUtil.getCurrentUserDetails());
+    UserDetails currentUserDetails;
+    if (CurrentUserUtil.hasCurrentUser()) {
+      currentUserDetails = CurrentUserUtil.getCurrentUserDetails();
+    } else {
+      currentUserDetails = new SystemUser();
+    }
+    return sendMessage(params, currentUserDetails);
   }
 
   @Override
@@ -254,7 +260,7 @@ public void sendReply(
       String metaData,
       boolean internal,
       Set<FileResource> attachments) {
-    User sender = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User sender = getCurrentUserOrNull();
 
     Message message = new Message(text, metaData, sender, internal);
 
@@ -288,7 +294,7 @@ public long sendCompletenessMessage(CompleteDataSetRegistration registration) {
 
     UserGroup userGroup = dataSet.getNotificationRecipients();
 
-    User sender = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User sender = getCurrentUserOrNull();
 
     // data set completed through sms
     if (sender == null) {
@@ -367,7 +373,7 @@ public MessageConversation getMessageConversation(String uid) {
       return null;
     }
 
-    User currentUser = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User currentUser = getCurrentUserOrNull();
 
     mc.setFollowUp(mc.isFollowUp(currentUser));
     mc.setRead(mc.isRead(currentUser));
@@ -378,7 +384,7 @@ public MessageConversation getMessageConversation(String uid) {
   @Override
   @Transactional(readOnly = true)
   public long getUnreadMessageConversationCount() {
-    User currentUser = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User currentUser = getCurrentUserOrNull();
     return messageConversationStore.getUnreadUserMessageConversationCount(currentUser);
   }
 
@@ -391,15 +397,15 @@ public long getUnreadMessageConversationCount(User user) {
   @Override
   @Transactional(readOnly = true)
   public List<MessageConversation> getMessageConversations() {
-    User currentUser = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User currentUser = getCurrentUserOrNull();
     return messageConversationStore.getMessageConversations(
         currentUser, null, false, false, null, null);
   }
 
   @Override
   @Transactional(readOnly = true)
   public List<MessageConversation> getMessageConversations(int first, int max) {
-    User currentUser = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User currentUser = getCurrentUserOrNull();
     return messageConversationStore.getMessageConversations(
         currentUser, null, false, false, first, max);
   }
@@ -437,7 +443,7 @@ public void deleteMessages(User user) {
   @Override
   @Transactional(readOnly = true)
   public List<UserMessage> getLastRecipients(int first, int max) {
-    User currentUser = userService.getUserByUsername(CurrentUserUtil.getCurrentUsername());
+    User currentUser = getCurrentUserOrNull();
     return messageConversationStore.getLastRecipients(currentUser, first, max);
   }
 
@@ -519,4 +525,12 @@ private Object constructUrl(
     String expectedBaseUrlFormat = removeAnyTrailingSlash(baseUrl);
     return expectedBaseUrlFormat + MESSAGE_PATH + messageType + "/" + uid;
   }
+
+  private User getCurrentUserOrNull() {
+    if (CurrentUserUtil.hasCurrentUser()) {
+      String currentUsername = CurrentUserUtil.getCurrentUsername();
+      return userService.getUserByUsername(currentUsername);
+    }
+    return null;
+  }
 }
diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/message/MessageServiceTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/message/MessageServiceTest.java
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.message;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -192,4 +193,18 @@ void testGetMessageConversations() {
     assertTrue(conversations.contains(conversationB));
     assertFalse(conversations.contains(conversationC));
   }
+
+  @Test
+  void testSendMessageWithNoCurrentUser() {
+    clearSecurityContext();
+    MessageConversationParams params =
+        new MessageConversationParams.Builder()
+            .withRecipients(Set.of(userA))
+            .withSubject("subject")
+            .withText("text")
+            .withMessageType(MessageType.SYSTEM)
+            .build();
+
+    assertDoesNotThrow(() -> messageService.sendMessage(params));
+  }
 }