Merge pull request #37 from CommitField/dev

Dev

Author: skyeong42

src/main/java/cmf/commitField/domain/chat/chatMessage/entity/ChatMessage.java

@@ -8,14 +8,14 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDateTime;
 
 @Entity
-@Builder
+@SuperBuilder
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/cmf/commitField/domain/chat/chatRoom/entity/ChatRoom.java

@@ -6,15 +6,15 @@
 import cmf.commitField.global.jpa.BaseEntity;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Entity
-@Builder
+@SuperBuilder
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/cmf/commitField/domain/chat/userChatRoom/entity/UserChatRoom.java

@@ -8,13 +8,13 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 @Entity
 @Getter
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserChatRoom extends BaseEntity {

src/main/java/cmf/commitField/domain/main/main/controller/ApiV1MainController.java

@@ -1,16 +1,9 @@
 package cmf.commitField.domain.main.main.controller;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @RequestMapping
 public class ApiV1MainController {
-    @GetMapping
-    @ResponseBody
-    public String getMain() {
-        return "Hello! cmf main!";
-    }
 }

src/main/java/cmf/commitField/domain/user/entity/CustomOAuth2User.java

@@ -0,0 +1,36 @@
+package cmf.commitField.domain.user.entity;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public class CustomOAuth2User implements OAuth2User {
+
+    private final OAuth2User oauth2User;
+    private final User user;
+
+    public CustomOAuth2User(OAuth2User oauth2User, User user) {
+        this.oauth2User = oauth2User;
+        this.user = user;
+    }
+
+    @Override
+    public Map<String, Object> getAttributes() {
+        return oauth2User.getAttributes();
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));
+    }
+
+    @Override
+    public String getName() {
+        return user.getUsername();
+    }
+
+}

src/main/java/cmf/commitField/domain/user/entity/User.java

@@ -4,26 +4,34 @@
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
 import cmf.commitField.global.jpa.BaseEntity;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.OneToMany;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
 @Entity
 @Getter
-@Builder
+@Setter
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 public class User extends BaseEntity {
-    private String email;
-    private String nickname;
-    private String password;
+    private String username; // GitHub 로그인 ID
+    private String email; // 이메일
+    private String nickname; // 닉네임
+    private String avatarUrl; //아바타
 
+    @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
+    private Role role;
+
+    public enum Role {
+        USER, ADMIN
+    }
+    //추가
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
     private List<ChatRoom> chatRooms;
 

src/main/java/cmf/commitField/domain/user/repository/UserRepository.java

@@ -0,0 +1,10 @@
+package cmf.commitField.domain.user.repository;
+
+import cmf.commitField.domain.user.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findByUsername(String username);
+}

src/main/java/cmf/commitField/domain/user/service/CustomOAuth2UserService.java

@@ -0,0 +1,50 @@
+package cmf.commitField.domain.user.service;
+
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
+import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.Optional;
+
+@Service
+public class CustomOAuth2UserService extends DefaultOAuth2UserService {
+    private final UserRepository userRepository;
+
+    public CustomOAuth2UserService(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    @Override
+    public OAuth2User loadUser(OAuth2UserRequest userRequest) {
+        OAuth2User oauthUser = super.loadUser(userRequest);
+
+        Map<String, Object> attributes = oauthUser.getAttributes();
+        String username = (String) attributes.get("login");  // GitHub ID
+        String email = (String) attributes.get("email");
+        String name = (String) attributes.get("name");
+        String avatarUrl = (String) attributes.get("avatar_url");
+
+        // 이메일이 없는 경우를 대비하여 기본값 설정
+        if (email == null) {
+            email = username + "@github.com";
+        }
+
+        Optional<User> existingUser = userRepository.findByUsername(username);
+        User user;
+        if (existingUser.isPresent()) {
+            user = existingUser.get();
+            user.setAvatarUrl(avatarUrl);
+            user.setEmail(email);  // GitHub에서 이메일이 변경될 수도 있으니 업데이트\
+        } else {
+            user = new User(username, email, name, avatarUrl, User.Role.USER, null, null, null);
+            userRepository.save(user);
+        }
+
+        return new CustomOAuth2User(oauthUser, user);
+    }
+}

src/main/java/cmf/commitField/global/security/SecurityConfig.java

@@ -1,5 +1,7 @@
 package cmf.commitField.global.security;
 
+import cmf.commitField.domain.user.entity.CustomOAuth2User;
+import cmf.commitField.domain.user.service.CustomOAuth2UserService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -13,9 +15,14 @@
 @Configuration
 @EnableWebSecurity
 public class SecurityConfig {
+    private final CustomOAuth2UserService customOAuth2UserService;
+
+    public SecurityConfig(CustomOAuth2UserService customOAuth2UserService) {
+        this.customOAuth2UserService = customOAuth2UserService;
+    }
+
     @Bean
     protected SecurityFilterChain config(HttpSecurity http) throws Exception {
-
         //로그인 관련 설정
         http
                 .oauth2Login(oauth2 -> oauth2
@@ -24,6 +31,8 @@ protected SecurityFilterChain config(HttpSecurity http) throws Exception {
                             // 인증 정보가 SecurityContext에 추가되는 것을 보장
                             SecurityContextHolder.getContext().setAuthentication(authentication);
 
+                            CustomOAuth2User customUser = (CustomOAuth2User) authentication.getPrincipal();
+
                             // 디버깅: authentication 정보 확인
                             System.out.println("Authentication: " + authentication);
                             System.out.println("Principal: " + authentication.getPrincipal());