Fix: 메인페이지 비로그인시 작동하도록 수정

Kusitms-29th-Meetup-TeamE · May 18, 2024 · de9c6d4 · de9c6d4
1 parent ba8da12
commit de9c6d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/meetup/teame/backend/domain/auth/jwt/SecurityContextProvider.java b/src/main/java/com/meetup/teame/backend/domain/auth/jwt/SecurityContextProvider.java
@@ -3,6 +3,7 @@
 import com.meetup.teame.backend.global.exception.CustomException;
 import com.meetup.teame.backend.global.exception.ExceptionContent;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.Objects;
@@ -17,7 +18,13 @@ public static Long getAuthenticatedUserId() {
         return (Long) principal;
     }
 
-    public static Boolean isAuthenticated() {
-        return Objects.nonNull(SecurityContextHolder.getContext().getAuthentication());
+    public static boolean isAnonymousUser() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication == null) {
+            return false;
+        }
+        return authentication.getAuthorities().stream()
+                .map(GrantedAuthority::getAuthority)
+                .anyMatch(role -> role.equals("ROLE_ANONYMOUS"));
     }
 }
diff --git a/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java b/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java
@@ -48,7 +48,7 @@ public class UserService {
 
     public ReadMainRes readMainPage() {
         Long userId = 5L;
-        if (SecurityContextProvider.isAuthenticated())
+        if(!SecurityContextProvider.isAnonymousUser())
             userId = SecurityContextProvider.getAuthenticatedUserId();
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ExceptionContent.NOT_FOUND_USER));