Merge pull request #216 from dnd-side-project/dev

feat(Login): 관리자 로그인 추가

Author: gzhan0226

main-server/src/main/java/com/example/demo/domain/user/repository/UsersRepository.java

@@ -1,17 +1,12 @@
 package com.example.demo.domain.user.repository;
 
 import com.example.demo.domain.user.entity.Users;
-import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 
 public interface UsersRepository extends JpaRepository<Users, String>, UserRepositoryCustom{
 
-    @Query("SELECT u.id FROM Users u")
-    List<String> findAllUserIds();
-
     Optional<Users> findUsersByShareCode(String shareCode);
 
     boolean existsByUsername(String nickname);

main-server/src/main/java/com/example/demo/global/kakao/controller/LoginController.java

@@ -1,5 +1,7 @@
 package com.example.demo.global.kakao.controller;
 
+import com.example.common.error.code.UserErrorCode;
+import com.example.common.error.exception.UserException;
 import com.example.demo.domain.user.entity.Users;
 import com.example.demo.domain.user.repository.UsersRepository;
 import com.example.demo.domain.user.service.NicknameGenerator;
@@ -8,6 +10,7 @@
 import com.example.demo.global.kakao.dto.KakaoLoginRequest;
 import com.example.demo.global.kakao.dto.KakaoLoginResponse;
 import com.example.demo.global.kakao.service.AuthService;
+import com.example.demo.global.security.filter.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -16,6 +19,8 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -43,18 +48,16 @@ public ResponseEntity<KakaoLoginResponse> kakaoLogin(
         return ResponseEntity.ok().body(out);
     }
 
-    @Operation(summary = "슈퍼 로그인 (임시 개발용)", description = "슈퍼 계정용 Access 토큰 발급 (test, test2, test3...)")
+    @Operation(summary = "관리자 로그인 ", description = "관리자 계정용 Access 토큰 발급")
     @ApiResponse(responseCode = "200", description = "슈퍼 토큰 발급 성공")
-    @GetMapping("/auth/super")
-    public ResponseEntity<String> superLogin() {
-        String nickname = nicknameGenerator.generateUniqueNickname();
-        Users user = new Users();
-        user.setUsername(nickname);
-        user.setRole(JwtRoleType.SUPER);
-        user.setProfileUrl("NULL");
-        Users savedUser = usersRepository.save(user);
-        String superToken = jwtAccessIssuer.issueSuperToken(savedUser.getId());
+    @PreAuthorize("hasRole('SUPER')")
+    @GetMapping("/auth/admin")
+    public ResponseEntity<String> adminLogin() {
+
+        Users adminUser = usersRepository.findById("ADMIN")
+                .orElseThrow(()-> new UserException("관리자 계정이 없습니다", UserErrorCode.USER_NOT_FOUND));
 
+        String superToken = jwtAccessIssuer.issueSuperToken(adminUser.getId());
         return ResponseEntity.ok().body(superToken);
     }
 
@@ -68,7 +71,7 @@ public ResponseEntity<String> anonymousLogin() {
         user.setRole(JwtRoleType.ANONYMOUS); //
         user.setProfileUrl("NULL");
         Users savedUser = usersRepository.save(user);
-        String anonymousToken = jwtAccessIssuer.issueSuperToken(savedUser.getId());
+        String anonymousToken = jwtAccessIssuer.issueAnonymousToken(savedUser.getId());
 
         return ResponseEntity.ok().body(anonymousToken);
     }

main-server/src/main/java/com/example/demo/global/security/config/SecurityConfig.java

@@ -10,13 +10,15 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 @Configuration
+@EnableMethodSecurity
 @RequiredArgsConstructor
 public class SecurityConfig {
 
@@ -43,6 +45,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 "/chat/health",
                                 "/api/health",
                                 "/api/playlist/songs",
+                                "/main/playlist/search/popular",
 
                                 // Swagger 관련 경로
                                 "/main/swagger-ui/**",
@@ -57,13 +60,10 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         ).permitAll()
                         .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
 
-                        // 마이페이지는 user/super 권한만 허용
                         .requestMatchers("/main/mypage/**").hasAnyAuthority("ROLE_USER", "ROLE_SUPER", "ROLE_ANONYMOUS")
 
-                        // 로그아웃은 인증만 필요
                         .requestMatchers("/auth/logout").authenticated()
 
-                        // 그 외 모든 요청은 인증만 필요
                         .anyRequest().authenticated()
                 )
                 .exceptionHandling(ex -> {