[feat] : 접근권한 제어

JNU-econovation · Sep 4, 2023 · 8cf2d65 · 8cf2d65
1 parent 6368a59
commit 8cf2d65
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 7 deletions.
diff --git a/...Recruit-Api/src/main/java/com/econovation/recruit/api/config/security/SecurityConfig.java b/...Recruit-Api/src/main/java/com/econovation/recruit/api/config/security/SecurityConfig.java
@@ -70,6 +70,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .permitAll()
                 .mvcMatchers(HttpMethod.GET, "/api/v1/token")
                 .permitAll()
+                .mvcMatchers(HttpMethod.GET, "/api/v1/timetables")
+                .permitAll()
+                .mvcMatchers(HttpMethod.POST, "/api/v1/timetables")
+                .permitAll()
                 .mvcMatchers(HttpMethod.POST, "/api/v1/questions")
                 .permitAll()
                 .mvcMatchers(HttpMethod.POST, "/api/v1/applicants")
@@ -96,7 +100,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     @Bean
     public RoleHierarchyImpl roleHierarchy() {
         RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl();
-        roleHierarchy.setHierarchy("ROLE_PRESIDENT > ROLE_OPERATION > ROLE_TF > ROLE_SWAGGER");
+        roleHierarchy.setHierarchy("ROLE_PRESIDENT > ROLE_OPERATION > ROLE_TF > ROLE_SWAGGER > ROLE_GUEST");
         return roleHierarchy;
     }
 

diff --git a/server/Recruit-Api/src/main/java/com/econovation/recruit/utils/DataInit.java b/server/Recruit-Api/src/main/java/com/econovation/recruit/utils/DataInit.java
@@ -1,15 +1,23 @@
 package com.econovation.recruit.utils;
 
+import com.econovation.recruitdomain.domains.dto.InterviewerCreateDto;
+import com.econovation.recruitdomain.domains.interviewer.domain.Interviewer;
+import com.econovation.recruitdomain.domains.interviewer.domain.Role;
+import com.econovation.recruitdomain.out.InterviewerRecordPort;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
+import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jdbc.datasource.init.ScriptUtils;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -18,6 +26,14 @@
 @ConditionalOnProperty(name = "data.init.disabled", havingValue = "false", matchIfMissing = true)
 public class DataInit {
     private final DataSource dataSource;
+    private final InterviewerRecordPort interviewerRecordPort;
+    private final PasswordEncoder passwordEncoder;
+
+    @Value("${data.init.admin.id}")
+    private String adminEmail;
+
+    @Value("${data.init.admin.password}")
+    private String adminPassword;
 
     @PostConstruct
     public void init() throws IOException, SQLException {
@@ -27,5 +43,14 @@ public void init() throws IOException, SQLException {
         String sql = new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
         log.info(sql);
         ScriptUtils.executeSqlScript(dataSource.getConnection(), resource);
+        String encededPassword = passwordEncoder.encode(adminPassword);
+        Interviewer admin = Interviewer.builder()
+                .name("이서현")
+                .role(Role.ROLE_OPERATION)
+                .year(21)
+                .email(adminEmail)
+                .password(encededPassword)
+                .build();
+        interviewerRecordPort.save(admin);
     }
 }
diff --git a/server/Recruit-Api/src/main/resources/application.yml b/server/Recruit-Api/src/main/resources/application.yml
@@ -11,6 +11,9 @@ spring:
 data:
   init:
     disabled: ${DATA_INIT_DISABLED:false}
+    admin:
+      id: ${ADMINISTRATOR_ID:admin}
+      password: ${ADMINISTRATOR_PASSWORD:password}
 server:
   port: ${SERVER_PORT:8080}
 throttle:

diff --git a/server/Recruit-Common/src/main/java/com/econovation/recruitcommon/consts/RecruitStatic.java b/server/Recruit-Common/src/main/java/com/econovation/recruitcommon/consts/RecruitStatic.java
@@ -66,6 +66,6 @@ public class RecruitStatic {
         "/api-docs"
     };
     public static final String[] RolePattern = {
-        "ROLE_TF", "ROLE_PRESIDENT", "ROLE_OPERATION",
+        "ROLE_TF", "ROLE_PRESIDENT", "ROLE_OPERATION", "ROLE_SWAGGER"
     };
 }
diff --git a/...n/src/main/java/com/econovation/recruitdomain/domains/interviewer/domain/Interviewer.java b/...n/src/main/java/com/econovation/recruitdomain/domains/interviewer/domain/Interviewer.java
@@ -36,7 +36,7 @@ public class Interviewer {
 
     @PrePersist
     public void prePersist() {
-        this.role = Role.ROLE_TF;
+        this.role = Role.ROLE_GUEST;
     }
 
     public void updateRole(Role role) {

diff --git a/...t-Domain/src/main/java/com/econovation/recruitdomain/domains/interviewer/domain/Role.java b/...t-Domain/src/main/java/com/econovation/recruitdomain/domains/interviewer/domain/Role.java
@@ -7,7 +7,9 @@
 public enum Role {
     ROLE_PRESIDENT("PRESIDENT"),
     ROLE_OPERATION("OPERATION"),
-    ROLE_TF("TF");
+    ROLE_TF("TF"),
+    ROLE_GUEST("GUEST"),
+    ;
     private final String role;
 
     Role(String role) {
@@ -22,10 +24,8 @@ public static Role getByName(String name) {
         for (Role os : Role.values()) {
             if (os.getRole().equals(name)) {
                 return os;
-            } else {
-                throw InterviewerInvalidRoleException.EXCEPTION;
             }
         }
-        return null;
+        throw InterviewerInvalidRoleException.EXCEPTION;
     }
 }