❇️ 로그인/회원가입시 email정보 추가저장

cheshireHYUN · cheshireHYUN · commit 18951f044723 · 2025-02-19T15:56:18.000+09:00
diff --git a/src/main/java/com/boggle_boggle/bbegok/controller/AppleController.java b/src/main/java/com/boggle_boggle/bbegok/controller/AppleController.java
@@ -1,9 +1,8 @@
 package com.boggle_boggle.bbegok.controller;
 
-import com.boggle_boggle.bbegok.dto.base.DataResponseDto;
 import com.boggle_boggle.bbegok.entity.user.User;
 import com.boggle_boggle.bbegok.exception.exception.GeneralException;
-import com.boggle_boggle.bbegok.service.AppleService;
+import com.boggle_boggle.bbegok.oauth.service.AppleService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/boggle_boggle/bbegok/controller/UserController.java b/src/main/java/com/boggle_boggle/bbegok/controller/UserController.java
@@ -4,7 +4,7 @@
 import com.boggle_boggle.bbegok.dto.base.DataResponseDto;
 import com.boggle_boggle.bbegok.dto.request.NickNameRequest;
 import com.boggle_boggle.bbegok.dto.response.TermsResponse;
-import com.boggle_boggle.bbegok.service.RevokeService;
+import com.boggle_boggle.bbegok.oauth.service.RevokeService;
 import com.boggle_boggle.bbegok.service.UserService;
 import com.boggle_boggle.bbegok.utils.CookieUtil;
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/boggle_boggle/bbegok/entity/Terms.java b/src/main/java/com/boggle_boggle/bbegok/entity/Terms.java
@@ -19,7 +19,7 @@ public class Terms {
     @Column(name = "title", nullable = false)
     private String title;
 
-    @Column(name = "content", nullable = false, length = 1000)
+    @Column(name = "content", nullable = false, length = 10000)
     private String content;
 
     @Column(name = "version", nullable = false)
diff --git a/src/main/java/com/boggle_boggle/bbegok/entity/user/User.java b/src/main/java/com/boggle_boggle/bbegok/entity/user/User.java
@@ -10,6 +10,8 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.minidev.json.annotate.JsonIgnore;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
 
 import java.time.LocalDateTime;
 
@@ -32,11 +34,6 @@ public class User {
     @Column(name = "user_name", unique = true, length = 12)
     private String userName = null;
 
-    @JsonIgnore
-    @Column(name = "password", length = 128)
-    @Size(max = 128)
-    private String password;
-
     @JsonIgnore
     @Column(name = "oauth2_access_token", length = 512)
     private String oauth2AccessToken;
@@ -45,17 +42,10 @@ public class User {
     @Column(name = "oauth2_refresh_token", length = 512)
     private String oauth2RefreshToken;
 
-    @Column(name = "email", length = 512, unique = true, nullable = true)
+    @Column(name = "email", length = 512)
     @Size(max = 512)
     private String email;
 
-    @Column(name = "email_verified_yn", length = 1)
-    @Size(min = 1, max = 1)
-    private String emailVerifiedYn;
-
-    @Column(name = "profile_image_url", length = 512, nullable = true)
-    private String profileImageUrl = null;
-
     @Column(name = "provider_type", length = 20)
     @Enumerated(EnumType.STRING)
     @NotNull
@@ -69,12 +59,14 @@ public class User {
     @Column(name = "agreed_version", length = 10)
     private String agreedVersion;
 
-    @Column(name = "created_at")
+    @CreationTimestamp
+    @Column(updatable = false, name = "created_at")
     @NotNull
-    private LocalDateTime createdAt;
+    private LocalDateTime createdAt = LocalDateTime.now();
 
-    @Column(name = "modified_at")
-    private LocalDateTime modifiedAt;
+    @UpdateTimestamp
+    @Column(name = "modified_at", insertable = false)
+    private LocalDateTime modifiedAt = LocalDateTime.now();
 
     @Column(name = "is_deleted")
     @NotNull
@@ -88,61 +80,48 @@ protected User(){}
 
     protected User(
             String userId,
-            String emailVerifiedYn,
             ProviderType providerType,
-            RoleType roleType,
-            LocalDateTime createdAt,
-            LocalDateTime modifiedAt) {
+            String email,
+            RoleType roleType) {
         this.userId = userId;
-        this.emailVerifiedYn = emailVerifiedYn;
         this.providerType = providerType;
         this.roleType = roleType;
-        this.createdAt = createdAt;
-        this.modifiedAt = modifiedAt;
+        this.email = email;
     }
 
 
     protected User(
             String userId,
-            String emailVerifiedYn,
             ProviderType providerType,
+            String email,
             RoleType roleType,
-            LocalDateTime createdAt,
-            LocalDateTime modifiedAt,
             String accessToken,
             String refreshToken) {
         this.userId = userId;
-        this.emailVerifiedYn = emailVerifiedYn;
         this.providerType = providerType;
+        this.email = email;
         this.roleType = roleType;
-        this.createdAt = createdAt;
-        this.modifiedAt = modifiedAt;
         this.oauth2AccessToken = accessToken;
         this.oauth2RefreshToken = refreshToken;
     }
 
-
     public static User createUser(
             @NotNull String userId,
-            @NotNull String emailVerifiedYn,
             @NotNull ProviderType providerType,
-            @NotNull RoleType roleType,
-            @NotNull LocalDateTime createdAt,
-            @NotNull LocalDateTime modifiedAt){
-        return new User(userId, emailVerifiedYn, providerType, roleType, createdAt, modifiedAt);
+            String email,
+            @NotNull RoleType roleType){
+        return new User(userId, providerType, email, roleType);
     }
 
     public static User createUser(
             @NotNull String userId,
-            @NotNull String emailVerifiedYn,
             @NotNull ProviderType providerType,
+            String email,
             @NotNull RoleType roleType,
-            @NotNull LocalDateTime createdAt,
-            @NotNull LocalDateTime modifiedAt,
             @NotNull String accessToken,
             @NotNull String refreshToken
     ){
-        return new User(userId, emailVerifiedYn, providerType, roleType, createdAt, modifiedAt, accessToken, refreshToken);
+        return new User(userId, providerType, email, roleType, accessToken, refreshToken);
     }
 
     public void updateNickName(String nickName){
@@ -160,8 +139,12 @@ public void updateGuestToUser(String latestVersion) {
         this.agreedVersion = latestVersion;
     }
 
-    public void updateAccessToken(String accessToken, String refreshToken) {
+    public void updateToken(String accessToken, String refreshToken) {
         this.oauth2AccessToken = accessToken;
         this.oauth2RefreshToken = refreshToken;
     }
+
+    public void updateEmail(String email) {
+        this.email = email;
+    }
 }
diff --git a/src/main/java/com/boggle_boggle/bbegok/oauth/entity/UserPrincipal.java b/src/main/java/com/boggle_boggle/bbegok/oauth/entity/UserPrincipal.java
@@ -87,7 +87,7 @@ public OidcIdToken getIdToken() {
     public static UserPrincipal create(User user) {
         return new UserPrincipal(
                 user.getUserId(),
-                user.getPassword(),
+                null,
                 user.getProviderType(),
                 user.getRoleType(),
                 Collections.singletonList(new SimpleGrantedAuthority(user.getRoleType().getCode()))
diff --git a/src/main/java/com/boggle_boggle/bbegok/oauth/info/OAuth2UserInfo.java b/src/main/java/com/boggle_boggle/bbegok/oauth/info/OAuth2UserInfo.java
@@ -18,4 +18,6 @@ public Map<String, Object> getAttributes() {
 
     public abstract String getId();
 
+    public abstract String getEmail();
+
 }
diff --git a/src/main/java/com/boggle_boggle/bbegok/oauth/info/impl/GoogleOAuth2UserInfo.java b/src/main/java/com/boggle_boggle/bbegok/oauth/info/impl/GoogleOAuth2UserInfo.java
@@ -14,4 +14,9 @@ public GoogleOAuth2UserInfo(Map<String, Object> attributes) {
     public String getId() {
         return String.valueOf(attributes.get("sub"));
     }
+
+    @Override
+    public String getEmail() {
+        return (String) attributes.get("email");
+    }
 }
diff --git a/src/main/java/com/boggle_boggle/bbegok/oauth/info/impl/KakaoOAuth2UserInfo.java b/src/main/java/com/boggle_boggle/bbegok/oauth/info/impl/KakaoOAuth2UserInfo.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 
 /** Kakao OAuth정보로부터 가져올 데이터들을 재정의
- * 빼곡은 오직 식별자만 필요로 한다.
  */
 public class KakaoOAuth2UserInfo extends OAuth2UserInfo {
 
@@ -17,4 +16,9 @@ public KakaoOAuth2UserInfo(Map<String, Object> attributes) {
     public String getId() {
         return String.valueOf(attributes.get("id"));
     }
+
+    @Override
+    public String getEmail() {
+        return (String) attributes.get("email");
+    }
 }
diff --git a/src/main/java/com/boggle_boggle/bbegok/oauth/service/AppleService.java b/src/main/java/com/boggle_boggle/bbegok/oauth/service/AppleService.java
@@ -1,4 +1,4 @@
-package com.boggle_boggle.bbegok.service;
+package com.boggle_boggle.bbegok.oauth.service;
 
 import com.boggle_boggle.bbegok.config.properties.AppProperties;
 import com.boggle_boggle.bbegok.config.properties.AppleProperties;
@@ -8,11 +8,13 @@
 import com.boggle_boggle.bbegok.oauth.entity.ProviderType;
 import com.boggle_boggle.bbegok.oauth.entity.RoleType;
 import com.boggle_boggle.bbegok.oauth.exception.OAuthProviderMissMatchException;
+import com.boggle_boggle.bbegok.oauth.info.OAuth2UserInfo;
 import com.boggle_boggle.bbegok.oauth.token.AuthToken;
 import com.boggle_boggle.bbegok.oauth.token.AuthTokenProvider;
 import com.boggle_boggle.bbegok.repository.user.UserRefreshTokenRepository;
 import com.boggle_boggle.bbegok.repository.user.UserRepository;
 import com.boggle_boggle.bbegok.repository.user.UserSettingsRepository;
+import com.boggle_boggle.bbegok.service.AccessTokenService;
 import com.boggle_boggle.bbegok.utils.CookieUtil;
 import com.boggle_boggle.bbegok.utils.UuidUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -27,6 +29,7 @@
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.stereotype.Service;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -70,6 +73,8 @@ public User process(String code) {
             JSONObject payload = objectMapper.readValue(getPayload.toJSONObject().toJSONString(), JSONObject.class);
 
             String userId = String.valueOf(payload.get("sub"));
+            String userEmail = String.valueOf(payload.get("email"));
+
             savedUser = userRepository.findByUserIdAndIsDeleted(userId, false);
 
             if (savedUser != null) { //서로 다른 인증제공자간 충돌을 방지
@@ -79,9 +84,10 @@ public User process(String code) {
                                     " account. Please use your " + savedUser.getProviderType() + " account to login."
                     );
                 }
-                savedUser.updateAccessToken(accessToken, refreshToken);
+                savedUser.updateToken(accessToken, refreshToken);
+                savedUser.updateEmail(userEmail);
             } else {
-                savedUser = createAppleUser(userId,accessToken, refreshToken);
+                savedUser = createAppleUser(userId, userEmail, accessToken, refreshToken);
                 userSettingsRepository.saveAndFlush(UserSettings.createUserSettings(savedUser));
             }
 
@@ -123,16 +129,13 @@ public String determineSuccessRedirectUrl(String accessToken, String baseUrl) {
                 .build().toUriString();
     }
 
-    private User createAppleUser(String userId, String accessToken, String refreshToken) {
-        log.debug("# ACCESS TOKEN =>>>>> {}",accessToken);
+    private User createAppleUser(String userId, String userEmail, String accessToken, String refreshToken) {
         LocalDateTime now = LocalDateTime.now();
         User user = User.createUser(
                 userId,
-                "Y",
                 ProviderType.APPLE,
+                userEmail,
                 RoleType.GUEST,
-                now,
-                now,
                 accessToken,
                 refreshToken
         );
diff --git a/src/main/java/com/boggle_boggle/bbegok/oauth/service/CustomOAuth2UserService.java b/src/main/java/com/boggle_boggle/bbegok/oauth/service/CustomOAuth2UserService.java
@@ -46,8 +46,8 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
 
     private OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
         ProviderType providerType = ProviderType.valueOf(userRequest.getClientRegistration().getRegistrationId().toUpperCase());
-        String userId = user.getName(); //OAuth2에서 제공하는 고유식별자
-        User savedUser = userRepository.findByUserIdAndIsDeleted(userId, false);
+        OAuth2UserInfo userInfo = OAuth2UserInfoFactory.getOAuth2UserInfo(providerType, user.getAttributes());
+        User savedUser = userRepository.findByUserIdAndIsDeleted(userInfo.getId(), false);
 
         if (savedUser != null) { //서로 다른 인증제공자간 충돌을 방지
             if (providerType != savedUser.getProviderType()) {
@@ -56,27 +56,29 @@ private OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
                                 " account. Please use your " + savedUser.getProviderType() + " account to login."
                 );
             }
-            //기존 가입자에게 셋팅정보가 없다면 생성
-            if(userSettingsRepository.findByUser(savedUser) == null) userSettingsRepository.saveAndFlush(UserSettings.createUserSettings(savedUser));
+            updateUser(savedUser, userInfo);
         } else {
             //가입한적 없다면 회원가입을 진행.
-            savedUser = createUser(userId, providerType);
+            savedUser = createUser(userInfo, providerType);
             userSettingsRepository.saveAndFlush(UserSettings.createUserSettings(savedUser));
         }
 
         //이미 가입한 유저라면 가입한 유저, 회원가입했다면 회원가입할 유저의 정보를 리턴
         return UserPrincipal.create(savedUser, user.getAttributes());
     }
 
-    private User createUser(String userId, ProviderType providerType) {
-        LocalDateTime now = LocalDateTime.now();
+    private void updateUser(User user, OAuth2UserInfo userInfo) {
+        if (userInfo.getEmail() != null && !user.getEmail().equals(userInfo.getEmail())) {
+            user.updateEmail(userInfo.getEmail());
+        }
+    }
+
+    private User createUser(OAuth2UserInfo userInfo, ProviderType providerType) {
         User user = User.createUser(
-                userId,
-                "Y",
+                userInfo.getId(),
                 providerType,
-                RoleType.GUEST,
-                now,
-                now
+                userInfo.getEmail(),
+                RoleType.GUEST
         );
 
         return userRepository.saveAndFlush(user);
diff --git a/src/main/java/com/boggle_boggle/bbegok/oauth/service/RevokeService.java b/src/main/java/com/boggle_boggle/bbegok/oauth/service/RevokeService.java
@@ -1,4 +1,4 @@
-package com.boggle_boggle.bbegok.service;
+package com.boggle_boggle.bbegok.oauth.service;
 
 import com.boggle_boggle.bbegok.config.properties.AppleProperties;
 import com.boggle_boggle.bbegok.entity.user.User;
@@ -7,7 +7,6 @@
 import com.boggle_boggle.bbegok.oauth.entity.ProviderType;
 import com.boggle_boggle.bbegok.repository.user.UserRefreshTokenRepository;
 import com.boggle_boggle.bbegok.repository.user.UserRepository;
-import com.boggle_boggle.bbegok.utils.CookieUtil;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -17,11 +16,6 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;
-import java.security.AuthProvider;
-import java.util.Optional;
-
-import static org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames.DEVICE_CODE;
-import static org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames.REFRESH_TOKEN;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -31,7 +25,6 @@ public class RevokeService {
     private final UserRepository userRepository;
     private final AppleProperties appleProperties;
     private final UserRefreshTokenRepository userRefreshTokenRepository;
-    private final AppleService appleService;
 
     @Value("${apple.revoke-url}")
     String appleRevokeUrl;
diff --git a/src/main/resources/application.properties.templates b/src/main/resources/application.properties.templates
@@ -59,6 +59,7 @@ spring.security.oauth2.client.registration.kakao.client-authentication-method=cl
 spring.security.oauth2.client.registration.kakao.authorizationGrantType=authorization_code
 spring.security.oauth2.client.registration.kakao.redirectUri=https://${DOMAIN_NAME}:50443/backend/{action}/oauth2/code/{registrationId}
 spring.security.oauth2.client.registration.kakao.clientName=Kakao
+spring.security.oauth2.client.registration.kakao.scope=account_email
 spring.security.oauth2.client.provider.kakao.authorizationUri=https://kauth.kakao.com/oauth/authorize
 spring.security.oauth2.client.provider.kakao.tokenUri=https://kauth.kakao.com/oauth/token
 spring.security.oauth2.client.provider.kakao.userInfoUri=https://kapi.kakao.com/v2/user/me

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,6 @@ public Map<String, Object> getAttributes() {`
`18`	`18`
`19`	`19`	`public abstract String getId();`
`20`	`20`
	`21`	`+ public abstract String getEmail();`
	`22`	`+`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,9 @@ public GoogleOAuth2UserInfo(Map<String, Object> attributes) {`
`14`	`14`	`public String getId() {`
`15`	`15`	`return String.valueOf(attributes.get("sub"));`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ @Override`
	`19`	`+ public String getEmail() {`
	`20`	`+ return (String) attributes.get("email");`
	`21`	`+ }`
`17`	`22`	`}`