feat: 레디스 적용 및 로그아웃 api 추가

.github/workflows/backend-test-when-pr.yml

@@ -18,6 +18,18 @@ jobs:
     defaults:
       run:
         working-directory: ./
+
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17

build.gradle

@@ -42,6 +42,7 @@ dependencies {
     // db
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.mysql:mysql-connector-j'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
     // flyway
     implementation 'org.flywaydb:flyway-core'

src/docs/asciidoc/admin.adoc

@@ -40,3 +40,13 @@ include::{snippets}/admin-auth-controller-test/관리자_액세스_토큰_재발
 ==== 응답
 include::{snippets}/admin-auth-controller-test/관리자_액세스_토큰_재발행/http-response.adoc[]
 include::{snippets}/admin-auth-controller-test/관리자_액세스_토큰_재발행/response-fields.adoc[]
+
+
+=== 로그아웃 (DELETE api/admins/auth/logout)
+
+==== 요청
+include::{snippets}/admin-auth-controller-test/관리자_로그아웃/http-request.adoc[]
+include::{snippets}/admin-auth-controller-test/관리자_로그아웃/request-headers.adoc[]
+
+==== 응답
+include::{snippets}/admin-auth-controller-test/관리자_로그아웃/http-response.adoc[]

src/main/java/com/atwoz/admin/application/auth/AdminAccessTokenProvider.java

@@ -0,0 +1,6 @@
+package com.atwoz.admin.application.auth;
+
+public interface AdminAccessTokenProvider {
+
+    String createAccessToken(Long id);
+}

src/main/java/com/atwoz/admin/application/auth/AdminAuthService.java

@@ -6,9 +6,12 @@
 import com.atwoz.admin.application.auth.dto.AdminSignUpRequest;
 import com.atwoz.admin.application.auth.dto.AdminTokenResponse;
 import com.atwoz.admin.domain.admin.Admin;
+import com.atwoz.admin.domain.admin.AdminRefreshToken;
+import com.atwoz.admin.domain.admin.AdminRefreshTokenRepository;
 import com.atwoz.admin.domain.admin.AdminRepository;
-import com.atwoz.admin.domain.admin.AdminTokenProvider;
+import com.atwoz.admin.domain.admin.service.AdminRefreshTokenProvider;
 import com.atwoz.admin.exception.exceptions.AdminNotFoundException;
+import com.atwoz.admin.exception.exceptions.InvalidRefreshTokenException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,10 +21,10 @@
 @Transactional
 public class AdminAuthService {
 
-    private static final String ID = "id";
-
     private final AdminRepository adminRepository;
-    private final AdminTokenProvider adminTokenProvider;
+    private final AdminAccessTokenProvider adminAccessTokenProvider;
+    private final AdminRefreshTokenProvider adminRefreshTokenProvider;
+    private final AdminRefreshTokenRepository adminRefreshTokenRepository;
 
     public AdminTokenResponse signUp(final AdminSignUpRequest adminSignUpRequest) {
         AdminProfileSignUpRequest adminProfileSignUpRequest = adminSignUpRequest.adminProfileSignUpRequest();
@@ -33,37 +36,46 @@ public AdminTokenResponse signUp(final AdminSignUpRequest adminSignUpRequest) {
                 adminProfileSignUpRequest.phoneNumber()
         );
         Admin savedAdmin = adminRepository.save(admin);
+        AdminRefreshToken adminRefreshToken = createAdminRefreshToken(savedAdmin);
+        adminRefreshTokenRepository.save(adminRefreshToken);
+        String accessToken = adminAccessTokenProvider.createAccessToken(savedAdmin.getId());
 
-        return createAdminTokenResponse(savedAdmin.getId());
-    }
-
-    private AdminTokenResponse createAdminTokenResponse(final Long id) {
-        return new AdminTokenResponse(
-                adminTokenProvider.createAccessToken(id),
-                adminTokenProvider.createRefreshToken(id)
-        );
+        return new AdminTokenResponse(accessToken, adminRefreshToken.refreshToken());
     }
 
     public AdminTokenResponse login(final AdminLoginRequest adminLoginRequest) {
         Admin foundAdmin = findAdminByEmail(adminLoginRequest.email());
         foundAdmin.validatePassword(adminLoginRequest.password());
+        AdminRefreshToken adminRefreshToken = createAdminRefreshToken(foundAdmin);
+        adminRefreshTokenRepository.save(adminRefreshToken);
+        String accessToken = adminAccessTokenProvider.createAccessToken(foundAdmin.getId());
 
-        return createAdminTokenResponse(foundAdmin.getId());
-    }
-
-    public AdminAccessTokenResponse reGenerateAccessToken(final String refreshToken) {
-        Admin foundAdmin = findAdminById(adminTokenProvider.extract(refreshToken, ID, Long.class));
-
-        return new AdminAccessTokenResponse(adminTokenProvider.createAccessToken(foundAdmin.getId()));
+        return new AdminTokenResponse(accessToken, adminRefreshToken.refreshToken());
     }
 
     private Admin findAdminByEmail(final String email) {
         return adminRepository.findAdminByEmail(email)
                 .orElseThrow(AdminNotFoundException::new);
     }
 
-    private Admin findAdminById(final Long id) {
-        return adminRepository.findAdminById(id)
-                .orElseThrow(AdminNotFoundException::new);
+    private AdminRefreshToken createAdminRefreshToken(final Admin savedAdmin) {
+        return AdminRefreshToken.createWith(
+                adminRefreshTokenProvider,
+                savedAdmin.getEmail(),
+                savedAdmin.getId()
+        );
+    }
+
+    public AdminAccessTokenResponse reGenerateAccessToken(final String refreshToken) {
+        AdminRefreshToken foundAdminRefreshToken = adminRefreshTokenRepository.findById(refreshToken)
+                .orElseThrow(InvalidRefreshTokenException::new);
+        Long memberId = foundAdminRefreshToken.memberId();
+        String createdAccessToken = adminAccessTokenProvider.createAccessToken(memberId);
+
+        return new AdminAccessTokenResponse(createdAccessToken);
+    }
+
+    public void logout(final String refreshToken) {
+        adminRefreshTokenRepository.delete(refreshToken);
     }
 }

src/main/java/com/atwoz/admin/domain/admin/AdminRefreshToken.java

@@ -0,0 +1,21 @@
+package com.atwoz.admin.domain.admin;
+
+import com.atwoz.admin.domain.admin.service.AdminRefreshTokenProvider;
+import lombok.Builder;
+import org.springframework.data.annotation.Id;
+
+@Builder
+public record AdminRefreshToken(
+        @Id String refreshToken,
+        Long memberId
+) {
+
+    public static AdminRefreshToken createWith(final AdminRefreshTokenProvider adminRefreshTokenProvider,
+                                               final String email,
+                                               final Long memberId) {
+        return AdminRefreshToken.builder()
+                .refreshToken(adminRefreshTokenProvider.createRefreshToken(email))
+                .memberId(memberId)
+                .build();
+    }
+}

src/main/java/com/atwoz/admin/domain/admin/AdminRefreshTokenRepository.java

@@ -0,0 +1,12 @@
+package com.atwoz.admin.domain.admin;
+
+import java.util.Optional;
+
+public interface AdminRefreshTokenRepository {
+
+    void save(AdminRefreshToken adminRefreshToken);
+
+    Optional<AdminRefreshToken> findById(String refreshToken);
+
+    void delete(String refreshToken);
+}

src/main/java/com/atwoz/admin/domain/admin/service/AdminRefreshTokenProvider.java

@@ -0,0 +1,6 @@
+package com.atwoz.admin.domain.admin.service;
+
+public interface AdminRefreshTokenProvider {
+
+    String createRefreshToken(String email);
+}

src/main/java/com/atwoz/admin/exception/AdminExceptionHandler.java

@@ -3,6 +3,7 @@
 import com.atwoz.admin.exception.exceptions.AdminLoginInvalidException;
 import com.atwoz.admin.exception.exceptions.AdminNotFoundException;
 import com.atwoz.admin.exception.exceptions.InvalidPasswordException;
+import com.atwoz.admin.exception.exceptions.InvalidRefreshTokenException;
 import com.atwoz.admin.exception.exceptions.PasswordMismatchException;
 import com.atwoz.admin.exception.exceptions.UnauthorizedAccessToAdminException;
 import org.springframework.http.HttpStatus;
@@ -38,6 +39,11 @@ public ResponseEntity<String> handleAdminLoginInvalidException(final AdminLoginI
         return getUnauthorized(e);
     }
 
+    @ExceptionHandler(InvalidRefreshTokenException.class)
+    public ResponseEntity<String> handleRefreshTokenInvalidException(final InvalidRefreshTokenException e) {
+        return getUnauthorized(e);
+    }
+
     private ResponseEntity<String> getNotFoundResponse(final Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
                 .body(e.getMessage());

src/main/java/com/atwoz/admin/exception/exceptions/InvalidRefreshTokenException.java

@@ -0,0 +1,8 @@
+package com.atwoz.admin.exception.exceptions;
+
+public class InvalidRefreshTokenException extends RuntimeException {
+
+    public InvalidRefreshTokenException() {
+        super("리프레쉬 토큰이 유효하지 않습니다");
+    }
+}

src/main/java/com/atwoz/admin/infrastructure/auth/AdminJwtTokenProvider.java → src/main/java/com/atwoz/admin/infrastructure/auth/AdminJwtAccessTokenProvider.java

@@ -1,6 +1,8 @@
 package com.atwoz.admin.infrastructure.auth;
 
-import com.atwoz.admin.domain.admin.AdminTokenProvider;
+import com.atwoz.admin.application.auth.AdminAccessTokenProvider;
+import com.atwoz.admin.domain.admin.service.AdminRefreshTokenProvider;
+import com.atwoz.admin.ui.auth.support.AdminTokenExtractor;
 import com.atwoz.member.exception.exceptions.auth.ExpiredTokenException;
 import com.atwoz.member.exception.exceptions.auth.SignatureInvalidException;
 import com.atwoz.member.exception.exceptions.auth.TokenFormInvalidException;
@@ -24,9 +26,12 @@
 
 @NoArgsConstructor
 @Component
-public class AdminJwtTokenProvider implements AdminTokenProvider {
+public class AdminJwtAccessTokenProvider implements AdminAccessTokenProvider,
+        AdminRefreshTokenProvider,
+        AdminTokenExtractor {
 
     private static final String ID = "id";
+    private static final String EMAIL = "email";
     private static final String TOKEN_TYPE = "token type";
     private static final String REFRESH_TOKEN = "refresh token";
     private static final String ACCESS_TOKEN = "access token";
@@ -60,16 +65,17 @@ public String createAccessToken(final Long id) {
     }
 
     @Override
-    public String createRefreshToken(final Long id) {
+    public String createRefreshToken(final String email) {
         Claims claims = Jwts.claims();
-        claims.put(ID, id);
+        claims.put(EMAIL, email);
         claims.put(TOKEN_TYPE, REFRESH_TOKEN);
         claims.put(ROLE, ADMIN);
 
         return createToken(claims, refreshTokenExpirationPeriod);
     }
 
-    private String createToken(final Claims claims, final int expirationPeriod) {
+    private String createToken(final Claims claims,
+                               final int expirationPeriod) {
         return Jwts.builder()
                 .setClaims(claims)
                 .setIssuedAt(issuedAt())
@@ -94,7 +100,9 @@ private Date expiredAt(final int expirationPeriod) {
     }
 
     @Override
-    public <T> T extract(final String token, final String claimName, final Class<T> classType) {
+    public <T> T extract(final String token,
+                         final String claimName,
+                         final Class<T> classType) {
         try {
             return Jwts.parserBuilder()
                     .setSigningKey(secret.getBytes())

src/main/java/com/atwoz/admin/infrastructure/auth/AdminRedisRefreshTokenRepository.java

@@ -0,0 +1,46 @@
+package com.atwoz.admin.infrastructure.auth;
+
+import com.atwoz.admin.domain.admin.AdminRefreshToken;
+import com.atwoz.admin.domain.admin.AdminRefreshTokenRepository;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class AdminRedisRefreshTokenRepository implements AdminRefreshTokenRepository {
+
+    @Value("${redis.expiration-period}")
+    private int expirationPeriod;
+
+    private final RedisTemplate<String, Long> redisTemplate;
+
+
+    @Override
+    public void save(final AdminRefreshToken adminRefreshToken) {
+        ValueOperations<String, Long> valueOperations = redisTemplate.opsForValue();
+        valueOperations.set(adminRefreshToken.refreshToken(), adminRefreshToken.memberId());
+        redisTemplate.expire(adminRefreshToken.refreshToken(), expirationPeriod, TimeUnit.DAYS);
+    }
+
+    @Override
+    public Optional<AdminRefreshToken> findById(final String refreshToken) {
+        ValueOperations<String, Long> valueOperations = redisTemplate.opsForValue();
+        Long memberId = valueOperations.get(refreshToken);
+        if (Objects.isNull(memberId)) {
+            return Optional.empty();
+        }
+
+        return Optional.of(new AdminRefreshToken(refreshToken, memberId));
+    }
+
+    @Override
+    public void delete(final String refreshToken) {
+        redisTemplate.delete(refreshToken);
+    }
+}

src/main/java/com/atwoz/admin/ui/auth/AdminAuthController.java

@@ -12,6 +12,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseCookie;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -56,6 +57,14 @@ public ResponseEntity<AdminAccessTokenResponse> reGenerateAccessToken(
         return ResponseEntity.ok(adminAuthService.reGenerateAccessToken(refreshToken));
     }
 
+    @DeleteMapping("/logout")
+    public ResponseEntity<Void> login(@AdminRefreshToken final String refreshToken) {
+        adminAuthService.logout(refreshToken);
+
+        return ResponseEntity.ok()
+                .build();
+    }
+
 
     private HttpHeaders createCookieHeaders(final String refreshToken) {
         ResponseCookie cookie = ResponseCookie.from(COOKIE_NAME, refreshToken)
@@ -65,7 +74,7 @@ private HttpHeaders createCookieHeaders(final String refreshToken) {
                 .maxAge(maxAge)
                 .build();
         HttpHeaders httpHeaders = new HttpHeaders();
-        httpHeaders.add(HttpHeaders.COOKIE, cookie.toString());
+        httpHeaders.add(HttpHeaders.SET_COOKIE, cookie.toString());
 
         return httpHeaders;
     }

src/main/java/com/atwoz/admin/ui/auth/interceptor/AdminLoginValidCheckerInterceptor.java

@@ -1,10 +1,10 @@
 package com.atwoz.admin.ui.auth.interceptor;
 
-import com.atwoz.admin.domain.admin.AdminTokenProvider;
 import com.atwoz.admin.exception.exceptions.AdminLoginInvalidException;
 import com.atwoz.admin.exception.exceptions.UnauthorizedAccessToAdminException;
 import com.atwoz.admin.ui.auth.support.AdminAuthenticationContext;
 import com.atwoz.admin.ui.auth.support.AdminAuthenticationExtractor;
+import com.atwoz.admin.ui.auth.support.AdminTokenExtractor;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -21,20 +21,20 @@ public class AdminLoginValidCheckerInterceptor implements HandlerInterceptor {
 
     private final AdminAuthenticationContext adminAuthenticationContext;
     private final AdminAuthenticationExtractor adminAuthenticationExtractor;
-    private final AdminTokenProvider adminTokenProvider;
+    private final AdminTokenExtractor adminTokenExtractor;
 
     @Override
     public boolean preHandle(final HttpServletRequest request,
                              final HttpServletResponse response,
                              final Object handler) throws Exception {
         String token = adminAuthenticationExtractor.extractFromRequest(request)
                 .orElseThrow(AdminLoginInvalidException::new);
-        String extractedRole = adminTokenProvider.extract(token, ROLE, String.class);
+        String extractedRole = adminTokenExtractor.extract(token, ROLE, String.class);
         if (!extractedRole.equals(ADMIN)) {
             throw new UnauthorizedAccessToAdminException();
         }
 
-        Long extractedId = adminTokenProvider.extract(token, ADMIN_ID, Long.class);
+        Long extractedId = adminTokenExtractor.extract(token, ADMIN_ID, Long.class);
         adminAuthenticationContext.setAuthentication(extractedId);
 
         return true;