Feat: 관리자 인증 및 인가 기능 구현

src/main/java/com/example/sinitto/SinittoApplication.java

@@ -1,5 +1,6 @@
 package com.example.sinitto;
 
+import com.example.sinitto.common.properties.AdminProperties;
 import com.example.sinitto.common.properties.DummyProperties;
 import com.example.sinitto.common.properties.KakaoProperties;
 import org.springframework.boot.SpringApplication;
@@ -10,7 +11,7 @@
 
 @SpringBootApplication
 @EnableJpaAuditing
-@EnableConfigurationProperties({KakaoProperties.class, DummyProperties.class})
+@EnableConfigurationProperties({KakaoProperties.class, DummyProperties.class, AdminProperties.class})
 @EnableScheduling
 public class SinittoApplication {
 

src/main/java/com/example/sinitto/auth/controller/AuthController.java

@@ -58,7 +58,7 @@ public ResponseEntity<LoginResponse> kakaoCallback(@RequestParam("code") String
 
     @Operation(summary = "Redis안의 모든 데이터 제거", description = "발급된 refreshToken을 사용하지 못하게 Redis 안의 모든 데이터를 제거합니다.")
     @DeleteMapping("/redis")
-    public ResponseEntity<Void> deleteAllDataFromRedis(){
+    public ResponseEntity<Void> deleteAllDataFromRedis() {
         tokenService.deleteAllDataFromRedis();
         return new ResponseEntity<>(HttpStatus.OK);
     }

src/main/java/com/example/sinitto/auth/service/TokenService.java

@@ -120,7 +120,7 @@ public TokenResponse refreshAccessToken(String refreshToken) {
         return new TokenResponse(newAccessToken, newRefreshToken);
     }
 
-    public void deleteAllDataFromRedis(){
+    public void deleteAllDataFromRedis() {
         redisTemplate.getConnectionFactory()
                 .getConnection()
                 .serverCommands()

src/main/java/com/example/sinitto/common/config/SwaggerConfig.java

@@ -3,9 +3,9 @@
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -14,10 +14,9 @@
 @Configuration
 public class SwaggerConfig {
 
-    private final Environment environment;
-
     private static final String LOCAL_SERVER_URL = "http://localhost:8080";
     private static final String PROD_SERVER_URL = "https://sinitto.site";
+    private final Environment environment;
 
     public SwaggerConfig(Environment environment) {
         this.environment = environment;

src/main/java/com/example/sinitto/common/config/WebConfig.java

@@ -27,7 +27,7 @@ public class WebConfig implements WebMvcConfigurer {
     private static final int CONNECTIONS_PER_IP_PORT_PAIR = 5;
     private final JwtInterceptor jwtInterceptor;
 
-    public WebConfig(JwtInterceptor jwtInterceptor){
+    public WebConfig(JwtInterceptor jwtInterceptor) {
         this.jwtInterceptor = jwtInterceptor;
     }
 

src/main/java/com/example/sinitto/common/interceptor/JwtInterceptor.java

@@ -14,11 +14,12 @@
 public class JwtInterceptor implements HandlerInterceptor {
     private final MemberTokenService memberTokenService;
 
-    public JwtInterceptor(MemberTokenService memberTokenService){
+    public JwtInterceptor(MemberTokenService memberTokenService) {
         this.memberTokenService = memberTokenService;
     }
+
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();

src/main/java/com/example/sinitto/common/properties/AdminProperties.java

@@ -0,0 +1,10 @@
+package com.example.sinitto.common.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "admin")
+public record AdminProperties(
+        String adminEmail,
+        String adminPassword
+) {
+}

src/main/java/com/example/sinitto/common/service/SlackMessageService.java

@@ -14,17 +14,14 @@
 @Service
 public class SlackMessageService {
 
+    private final RestTemplate restTemplate;
     @Value("${slack.notice.webhook.url}")
     private String slackNoticeWebhookUrl;
-
     @Value("${slack.charge.request.url}")
     private String chargeRequestUrl;
-
     @Value("${slack.withdraw.request.url}")
     private String withdrawRequestUrl;
 
-    private final RestTemplate restTemplate;
-
     public SlackMessageService(RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
     }

src/main/java/com/example/sinitto/guard/service/GuardService.java

@@ -59,7 +59,7 @@ public void createSenior(Long memberId, SeniorRequest seniorRequest) {
         );
         if (member.isSinitto()) throw new BadRequestException("보호자만 이용할 수 있습니다.");
 
-        if(seniorRepository.existsByPhoneNumber(seniorRequest.seniorPhoneNumber())) {
+        if (seniorRepository.existsByPhoneNumber(seniorRequest.seniorPhoneNumber())) {
             throw new BadRequestException("이미 등록되어 있는 전화번호 입니다.");
         }
 
@@ -90,7 +90,7 @@ public void updateSenior(Long memberId, Long seniorId, SeniorRequest seniorReque
                 () -> new NotFoundException("이메일에 해당하는 시니어를 찾을 수 없습니다.")
         );
 
-        if(!senior.getPhoneNumber().equals(seniorRequest.seniorPhoneNumber())
+        if (!senior.getPhoneNumber().equals(seniorRequest.seniorPhoneNumber())
                 && seniorRepository.existsByPhoneNumber(seniorRequest.seniorPhoneNumber())) {
             throw new BadRequestException("이미 등록되어 있는 전화번호 입니다.");
         }

src/main/java/com/example/sinitto/member/controller/MemberAdminController.java

@@ -1,9 +1,11 @@
 package com.example.sinitto.member.controller;
 
 import com.example.sinitto.auth.service.TokenService;
+import com.example.sinitto.common.properties.AdminProperties;
 import com.example.sinitto.common.properties.DummyProperties;
 import com.example.sinitto.member.entity.Member;
 import com.example.sinitto.member.repository.MemberRepository;
+import jakarta.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,32 +17,61 @@
 import java.util.List;
 
 @Controller
-@RequestMapping("/dummy")
+@RequestMapping
 public class MemberAdminController {
 
     private final MemberRepository memberRepository;
     private final TokenService tokenService;
     private final DummyProperties dummyProperties;
-
+    private final AdminProperties adminProperties;
     private final List<String> dummyEmails = Arrays.asList(
             "[email protected]", "[email protected]", "[email protected]", "[email protected]", "[email protected]",
             "[email protected]", "[email protected]", "[email protected]", "[email protected]", "[email protected]"
     );
 
-    public MemberAdminController(MemberRepository memberRepository, TokenService tokenService, DummyProperties dummyProperties) {
+    public MemberAdminController(MemberRepository memberRepository, TokenService tokenService, DummyProperties dummyProperties, AdminProperties adminProperties) {
         this.memberRepository = memberRepository;
         this.tokenService = tokenService;
         this.dummyProperties = dummyProperties;
+        this.adminProperties = adminProperties;
     }
 
-    @GetMapping
+    @GetMapping("/dummy")
     public String showDummyLoginPage(Model model) {
         List<Member> dummyMembers = memberRepository.findAllByEmailIn(dummyEmails);
         model.addAttribute("members", dummyMembers);
         return "dummy/login";
     }
 
-    @PostMapping
+    @GetMapping("/admin/login")
+    public String showAdminLoginPage(HttpSession session) {
+        if (isAdmin(session)) {
+            return "redirect:/admin/point/charge";
+        }
+        return "point/login";
+    }
+
+    @PostMapping("/admin/login")
+    public String login(@RequestParam String email,
+                        @RequestParam String password,
+                        HttpSession session) {
+        if (adminProperties.adminEmail().equals(email) && adminProperties.adminPassword().equals(password)) {
+            session.setAttribute("email", email);
+            session.setAttribute("role", "ADMIN");
+            session.setMaxInactiveInterval(1800);
+            return "redirect:/admin/point/charge";
+        } else {
+            return "redirect:/admin/login?error=true";
+        }
+    }
+
+    @PostMapping("/admin/logout")
+    public String logout(HttpSession session) {
+        session.invalidate();
+        return "redirect:/admin/login";
+    }
+
+    @PostMapping("/dummy")
     public String login(
             @RequestParam("email") String email,
             @RequestParam("password") String password,
@@ -67,4 +98,9 @@ public String login(
         String frontendRedirectUrl = env.equals("dev") ? dummyProperties.devRedirectUri() : dummyProperties.redirectUri();
         return "redirect:" + frontendRedirectUrl + "?accessToken=" + accessToken + "&refreshToken=" + refreshToken + "&isSinitto=" + isSinitto;
     }
+
+    private boolean isAdmin(HttpSession session) {
+        String role = (String) session.getAttribute("role");
+        return "ADMIN".equals(role);
+    }
 }

src/main/java/com/example/sinitto/member/service/MemberTokenService.java

@@ -11,7 +11,7 @@ public class MemberTokenService {
     private final TokenService tokenService;
     private final MemberRepository memberRepository;
 
-    public MemberTokenService(TokenService tokenService, MemberRepository memberRepository){
+    public MemberTokenService(TokenService tokenService, MemberRepository memberRepository) {
         this.tokenService = tokenService;
         this.memberRepository = memberRepository;
     }

src/main/java/com/example/sinitto/point/controller/PointAdminController.java

@@ -3,6 +3,7 @@
 import com.example.sinitto.point.dto.PointLogWithBankInfo;
 import com.example.sinitto.point.dto.PointLogWithDepositMessage;
 import com.example.sinitto.point.service.PointAdminService;
+import jakarta.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,8 +22,10 @@ public PointAdminController(PointAdminService pointAdminService) {
     }
 
     @GetMapping("/admin/point/charge")
-    public String showAllChargeRequest(Model model) {
-
+    public String showAllChargeRequest(Model model, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
         List<PointLogWithDepositMessage> logWithDepositMessages = pointAdminService.getPointLogWithDepositMessage();
 
         model.addAttribute("logWithDepositMessages", logWithDepositMessages);
@@ -31,28 +34,37 @@ public String showAllChargeRequest(Model model) {
     }
 
     @PostMapping("/admin/point/charge/waiting/{pointLogId}")
-    public String changeToWaiting(@PathVariable Long pointLogId) {
-
+    public String changeToWaiting(@PathVariable Long pointLogId, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
         pointAdminService.changeChargeLogToWaiting(pointLogId);
         return "redirect:/admin/point/charge";
     }
 
     @PostMapping("/admin/point/charge/complete/{pointLogId}")
-    public String changeToCompleteAndEarn(@PathVariable Long pointLogId) {
-
+    public String changeToCompleteAndEarn(@PathVariable Long pointLogId, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
         pointAdminService.earnPointAndChangeToChargeComplete(pointLogId);
         return "redirect:/admin/point/charge";
     }
 
     @PostMapping("/admin/point/charge/fail/{pointLogId}")
-    public String changeToFail(@PathVariable Long pointLogId) {
-
+    public String changeToFail(@PathVariable Long pointLogId, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
         pointAdminService.changeChargeLogToFail(pointLogId);
         return "redirect:/admin/point/charge";
     }
 
     @GetMapping("/admin/point/withdraw")
-    public String showAllWithdrawRequest(Model model) {
+    public String showAllWithdrawRequest(Model model, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
 
         List<PointLogWithBankInfo> logWithBankInfos = pointAdminService.getPointLogWithBankInfo();
 
@@ -62,24 +74,35 @@ public String showAllWithdrawRequest(Model model) {
     }
 
     @PostMapping("/admin/point/withdraw/waiting/{pointLogId}")
-    public String changeWithdrawLogToWaiting(@PathVariable Long pointLogId) {
-
+    public String changeWithdrawLogToWaiting(@PathVariable Long pointLogId, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
         pointAdminService.changeWithdrawLogToWaiting(pointLogId);
         return "redirect:/admin/point/withdraw";
     }
 
     @PostMapping("/admin/point/withdraw/complete/{pointLogId}")
-    public String changeWithdrawLogToCompleteAndEarn(@PathVariable Long pointLogId) {
-
+    public String changeWithdrawLogToCompleteAndEarn(@PathVariable Long pointLogId, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
         pointAdminService.changeWithdrawLogToComplete(pointLogId);
         return "redirect:/admin/point/withdraw";
     }
 
     @PostMapping("/admin/point/withdraw/fail/{pointLogId}")
-    public String changeWithdrawLogToFail(@PathVariable Long pointLogId) {
-
+    public String changeWithdrawLogToFail(@PathVariable Long pointLogId, HttpSession session) {
+        if (!isAdmin(session)) {
+            return "redirect:/admin/login";
+        }
         pointAdminService.changeWithdrawLogToFail(pointLogId);
         return "redirect:/admin/point/withdraw";
     }
 
+    private boolean isAdmin(HttpSession session) {
+        String role = (String) session.getAttribute("role");
+        return "ADMIN".equals(role);
+    }
+
 }

src/main/java/com/example/sinitto/review/entity/Review.java

@@ -14,24 +14,18 @@
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 public class Review {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
     @NotNull
     int starCountForRequest;
-
     @NotNull
     int starCountForService;
-
     @NotNull
     int starCountForSatisfaction;
-
     @CreatedDate
     LocalDate postDate;
-
     String content;
-
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id")
     @NotNull

src/main/resources/application.properties

@@ -7,3 +7,4 @@ spring.profiles.active=dev
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 spring.h2.console.enabled=false
+server.servlet.session.tracking-modes = cookie