[FEAT] Oauth, JWT 기반 인증 인가 구현

build.gradle

@@ -30,13 +30,18 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'org.postgresql:postgresql'
 	runtimeOnly 'com.h2database:h2'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	runtimeOnly   'io.jsonwebtoken:jjwt-impl:0.11.5'
+	runtimeOnly   'io.jsonwebtoken:jjwt-jackson:0.11.5'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -11,5 +11,15 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
 
+  redis:
+    image: redis:7-alpine
+    container_name: dearobjet-redis
+    ports:
+      - "6379:6379"
+    command: [ "redis-server", "--appendonly", "yes" ]
+    volumes:
+      - redisdata:/data
+
 volumes:
   pgdata:
+  redisdata:

src/main/java/app/dearobjet/backend/domain/user/controller/UserController.java

@@ -0,0 +1,40 @@
+package app.dearobjet.backend.domain.user.controller;
+
+import app.dearobjet.backend.domain.user.dto.CompleteSignupRequest;
+import app.dearobjet.backend.domain.user.service.UserService;
+import app.dearobjet.backend.global.api.ApiResponse;
+import app.dearobjet.backend.global.auth.security.CustomUserDetails;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/users")
+public class UserController {
+    private final UserService userService;
+
+    /**
+     * 추가 회원가입 (TEMP → CUSTOMER / ARTIST / SHOP)
+     */
+    @PostMapping("/complete")
+    public ResponseEntity<ApiResponse<Void>> completeSignup(
+            @AuthenticationPrincipal CustomUserDetails userDetails,
+            @RequestBody CompleteSignupRequest request
+    ) {
+        Long userId = userDetails.getUserId();
+
+        userService.completeSignup(
+                userId,
+                request.getName(),
+                request.getEmail(),
+                request.getPhoneNumber(),
+                request.getSmsAgreement(),
+                request.getMarketingAgreement(),
+                request.getRole()
+        );
+
+        return ResponseEntity.ok(ApiResponse.of(null));
+    }
+}

src/main/java/app/dearobjet/backend/domain/user/dto/CompleteSignupRequest.java

@@ -0,0 +1,17 @@
+package app.dearobjet.backend.domain.user.dto;
+
+import app.dearobjet.backend.domain.user.enums.Role;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class CompleteSignupRequest {
+
+    private String name;
+    private String email;
+    private String phoneNumber;
+    private Boolean smsAgreement;
+    private Boolean marketingAgreement;
+    private Role role; // CUSTOMER / ARTIST / SHOP
+}

src/main/java/app/dearobjet/backend/domain/user/entity/User.java

@@ -1,6 +1,7 @@
 package app.dearobjet.backend.domain.user.entity;
 
-import app.dearobjet.backend.global.common.entity.BaseTimeEntity;
+import app.dearobjet.backend.domain.user.enums.Role;
+import app.dearobjet.backend.domain.user.enums.UserStatus;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -18,13 +19,12 @@ public class User extends BaseTimeEntity {
     @Column(name = "user_id")
     private Long userId;
 
-    @Column(nullable = false, unique = true)
+    @Column(unique = true)
     private String email;
 
-    @Column(nullable = false)
     private String name;
 
-    @Column(nullable = false, unique = true)
+    @Column(unique = true)
     private String phoneNumber;
 
     @Column(name = "profile_image")
@@ -36,18 +36,20 @@ public class User extends BaseTimeEntity {
     @Column(name = "marketing_agreement")
     private Boolean marketingAgreement;
 
+    @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private String role;  // CUSTOMER, ARTIST, SHOP
+    private Role role;
 
     @Column(name = "profile_url")
     private String profileUrl;
 
-    @Column(name = "user_status")
-    private String userStatus;
-
+    @Enumerated(EnumType.STRING)
+    @Column(name = "user_status", nullable = false)
+    private UserStatus userStatus;
 
-    @Column(name = "login_type")
-    private String loginType;  // EMAIL, KAKAO, NAVER, GOOGLE
+    // 카카오 단일
+//    @Column(name = "login_type")
+//    private String loginType;  // EMAIL, KAKAO, NAVER, GOOGLE
 
     @Column(name = "social_id")
     private String socialId;
@@ -59,7 +61,26 @@ public void updateProfile(String name, String profileUrl) {
     }
 
     public void deactivate() {
-        this.userStatus = "INACTIVE";
+        this.userStatus = UserStatus.INACTIVE;
     }
 
+    public void completeRegistration(
+            String name,
+            String email,
+            String phoneNumber,
+            Boolean smsAgreement,
+            Boolean marketingAgreement,
+            Role role
+    ) {
+        if (this.role != Role.TEMP) {
+            throw new IllegalStateException("User already registered");
+        }
+
+        this.name = name;
+        this.email = email;
+        this.phoneNumber = phoneNumber;
+        this.smsAgreement = smsAgreement;
+        this.marketingAgreement = marketingAgreement;
+        this.role = role;
+    }
 }

src/main/java/app/dearobjet/backend/domain/user/enums/Role.java

@@ -0,0 +1,8 @@
+package app.dearobjet.backend.domain.user.enums;
+
+public enum Role {
+    TEMP, // OAuth만 완료 (추가회원가입 전)
+    CUSTOMER,
+    ARTIST,
+    SHOP
+}

src/main/java/app/dearobjet/backend/domain/user/enums/UserStatus.java

@@ -0,0 +1,7 @@
+package app.dearobjet.backend.domain.user.enums;
+
+public enum UserStatus {
+    ACTIVE,
+    INACTIVE
+}
+

src/main/java/app/dearobjet/backend/domain/user/repository/UserRepository.java

@@ -1,7 +1,14 @@
 package app.dearobjet.backend.domain.user.repository;
 
 import app.dearobjet.backend.domain.user.entity.User;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
+
+    Optional<User> findBySocialId(String socialId);
+
+    Optional<User> findByEmail(String email);
+
+    boolean existsByEmail(String email);
 }

src/main/java/app/dearobjet/backend/domain/user/service/UserService.java

@@ -0,0 +1,25 @@
+package app.dearobjet.backend.domain.user.service;
+
+import app.dearobjet.backend.domain.user.entity.User;
+import app.dearobjet.backend.domain.user.enums.Role;
+
+public interface UserService {
+
+    // 카카오 OAuth 사용자 조회 또는 신규 생성
+    User getOrCreateKakaoUser(String socialId);
+
+    // 추가 회원가입
+    void completeSignup(
+            Long userId,
+            String name,
+            String email,
+            String phoneNumber,
+            Boolean smsAgreement,
+            Boolean marketingAgreement,
+            Role role
+    );
+
+    // 회원 비활성화
+    void deactivateUser(Long userId);
+}
+

src/main/java/app/dearobjet/backend/domain/user/service/UserServiceImpl.java

@@ -0,0 +1,78 @@
+package app.dearobjet.backend.domain.user.service;
+
+import app.dearobjet.backend.domain.user.entity.User;
+import app.dearobjet.backend.domain.user.enums.Role;
+import app.dearobjet.backend.domain.user.enums.UserStatus;
+import app.dearobjet.backend.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class UserServiceImpl implements UserService {
+
+    private final UserRepository userRepository;
+
+    /**
+     * 카카오 OAuth 로그인 사용자 조회 or 생성
+     */
+    @Override
+    public User getOrCreateKakaoUser(String socialId) {
+        return userRepository.findBySocialId(socialId)
+                .orElseGet(() -> createTempUser(socialId));
+    }
+
+    private User createTempUser(String socialId) {
+        User user = User.builder()
+                .socialId(socialId)
+                .role(Role.TEMP)
+                .userStatus(UserStatus.ACTIVE)
+                .build();
+
+        return userRepository.save(user);
+    }
+
+    /**
+     * 추가 회원가입 완료
+     */
+    @Override
+    public void completeSignup(
+            Long userId,
+            String name,
+            String email,
+            String phoneNumber,
+            Boolean smsAgreement,
+            Boolean marketingAgreement,
+            Role role
+    ) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new IllegalArgumentException("User not found"));
+
+        // 이메일 중복 체크
+        if (userRepository.existsByEmail(email)) {
+            throw new IllegalStateException("Email already exists");
+        }
+
+        user.completeRegistration(
+                name,
+                email,
+                phoneNumber,
+                smsAgreement,
+                marketingAgreement,
+                role
+        );
+    }
+
+    /**
+     * 회원 비활성화
+     */
+    @Override
+    public void deactivateUser(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new IllegalArgumentException("User not found"));
+
+        user.deactivate();
+    }
+}

src/main/java/app/dearobjet/backend/global/api/ErrorResponse.java

@@ -0,0 +1,10 @@
+package app.dearobjet.backend.global.api;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class ErrorResponse {
+    private String message;
+}

src/main/java/app/dearobjet/backend/global/auth/controller/AuthController.java

@@ -0,0 +1,49 @@
+package app.dearobjet.backend.global.auth.controller;
+
+import app.dearobjet.backend.global.auth.service.RefreshTokenRedisService;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class AuthController {
+
+    private final RefreshTokenRedisService refreshTokenRedisService;
+
+    @PostMapping("/auth/logout")
+    public ResponseEntity<Void> logout(HttpServletRequest request,
+                                       HttpServletResponse response) {
+
+        // 1. refresh 쿠키에서 값 추출
+        String refreshToken = null;
+        if (request.getCookies() != null) {
+            for (Cookie cookie : request.getCookies()) {
+                if ("refreshToken".equals(cookie.getName())) {
+                    refreshToken = cookie.getValue();
+                    break;
+                }
+            }
+        }
+
+        // 2. Redis에서 refresh 삭제
+        if (refreshToken != null) {
+            refreshTokenRedisService.delete(refreshToken);
+        }
+
+        // 3. refresh 쿠키 삭제
+        Cookie deleteCookie = new Cookie("refreshToken", null);
+        deleteCookie.setHttpOnly(true);
+        deleteCookie.setSecure(true); // https 환경
+        deleteCookie.setPath("/");
+        deleteCookie.setMaxAge(0);
+
+        response.addCookie(deleteCookie);
+
+        return ResponseEntity.noContent().build();
+    }
+}