Merge pull request '권한 테스트 api 수정' (#50) from feat/dev_251201 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/50

src/main/java/com/kamco/cd/kamcoback/auth/CustomUserDetails.java

@@ -2,8 +2,9 @@ package com.kamco.cd.kamcoback.auth;
 
 import com.kamco.cd.kamcoback.postgres.entity.MemberEntity;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 public class CustomUserDetails implements UserDetails {
@@ -16,7 +17,7 @@ public class CustomUserDetails implements UserDetails {
 
   @Override
   public Collection<? extends GrantedAuthority> getAuthorities() {
-    return Collections.emptyList();
+    return List.of(new SimpleGrantedAuthority("ROLE_" + member.getUserRole()));
   }
 
   @Override

src/main/java/com/kamco/cd/kamcoback/common/enums/RoleType.java

@@ -7,9 +7,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum RoleType implements EnumType {
-  ROLE_ADMIN("관리자"),
+  ADMIN("관리자"),
-  ROLE_LABELER("라벨러"),
+  LABELER("라벨러"),
-  ROLE_REVIEWER("검수자");
+  REVIEWER("검수자");
 
   private final String desc;
 

src/main/java/com/kamco/cd/kamcoback/config/SecurityConfig.java

@@ -42,13 +42,25 @@ public class SecurityConfig {
             customAuthenticationProvider) // 로그인 패스워드 비교방식 스프링 기본 Provider 사용안함 커스텀 사용
         .authorizeHttpRequests(
             auth ->
-                auth.requestMatchers(HttpMethod.OPTIONS, "/**")
+                auth
+                    // ADMIN만 접근
+                    .requestMatchers("/api/test/admin")
+                    .hasRole("ADMIN")
+
+                    // ADMIN, LABELER 접근
+                    .requestMatchers("/api/test/label")
+                    .hasAnyRole("ADMIN", "LABELER")
+
+                    // ADMIN, REVIEWER 접근
+                    .requestMatchers("/api/test/review")
+                    .hasAnyRole("ADMIN", "REVIEWER")
+                    .requestMatchers(HttpMethod.OPTIONS, "/**")
                     .permitAll() // preflight 허용
                     .requestMatchers(
                         "/api/auth/signin",
                         "/api/auth/refresh",
                         "/swagger-ui/**",
-                        "/api/members/{memberId}/password",
+                        "/api/members/*/password",
                         "/v3/api-docs/**")
                     .permitAll()
                     .anyRequest()

src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java

@@ -32,14 +32,10 @@ public class MembersDto {
     private String tempPassword;
     private String status;
     private String statusName;
-    @JsonFormatDttm
+    @JsonFormatDttm private ZonedDateTime createdDttm;
-    private ZonedDateTime createdDttm;
+    @JsonFormatDttm private ZonedDateTime updatedDttm;
-    @JsonFormatDttm
+    @JsonFormatDttm private ZonedDateTime firstLoginDttm;
-    private ZonedDateTime updatedDttm;
+    @JsonFormatDttm private ZonedDateTime lastLoginDttm;
-    @JsonFormatDttm
-    private ZonedDateTime firstLoginDttm;
-    @JsonFormatDttm
-    private ZonedDateTime lastLoginDttm;
 
     public Basic(
         Long id,
@@ -87,9 +83,7 @@ public class MembersDto {
   @AllArgsConstructor
   public static class SearchReq {
 
-    @Schema(
+    @Schema(description = "전체, 관리자(ADMIN), 라벨러(LABELER), 검수자(REVIEWER)", example = "")
-      description = "전체, 관리자(ROLE_ADMIN), 라벨러(ROLE_LABELER), 검수자(ROLE_REVIEWER)",
-      example = "")
     private String userRole;
 
     @Schema(description = "키워드", example = "홍길동")
@@ -111,7 +105,7 @@ public class MembersDto {
   @Setter
   public static class AddReq {
 
-    @Schema(description = "관리자 유형", example = "ROLE_ADMIN")
+    @Schema(description = "관리자 유형", example = "ADMIN")
     @NotBlank
     @Size(max = 50)
     private String userRole;

src/main/java/com/kamco/cd/kamcoback/test/TestApiController.java

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.test;
 
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -30,8 +31,8 @@ public class TestApiController {
         content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
   })
   @GetMapping("/admin")
-  public String admin() {
+  public ApiResponseDto<String> admin() {
-    return "I am administrator";
+    return ApiResponseDto.ok("I am administrator");
   }
 
   @Operation(summary = "label test", description = "label test api")
@@ -46,8 +47,8 @@ public class TestApiController {
         content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
   })
   @GetMapping("/label")
-  public String label() {
+  public ApiResponseDto<String> label() {
-    return "Labeling is available.";
+    return ApiResponseDto.ok("Labeling is available.");
   }
 
   @Operation(summary = "review test", description = "review test api")
@@ -62,7 +63,7 @@ public class TestApiController {
         content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
   })
   @GetMapping("/review")
-  public String review() {
+  public ApiResponseDto<String> review() {
-    return "Review is available.";
+    return ApiResponseDto.ok("Review is available.");
   }
 }