Merge pull request #75 from IT-Cotato/fix/oauth2-member

Fix 회원가입시 인증회원으로 초기화 되는 오류 수정
IT-Cotato · Aug 21, 2024 · 5143094 · 5143094
2 parents bfad56d + 8c91dbf
commit 5143094
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/com/cotato/squadus/api/auth/dto/OAuth2Attribute.java b/src/main/java/com/cotato/squadus/api/auth/dto/OAuth2Attribute.java
@@ -65,7 +65,7 @@ public Member toEntity(String uniqueId){
                 .username(username)
                 .email(email)
                 .uniqueId(uniqueId)
-                .memberRole(MemberRole.CERTIFIED_MEMBER.toString())
+                .memberRole(MemberRole.MEMBER.toString())
                 .profileImage("default profile img")
                 .university("uncertified")
                 .build();

diff --git a/src/main/java/com/cotato/squadus/domain/auth/entity/Member.java b/src/main/java/com/cotato/squadus/domain/auth/entity/Member.java
@@ -76,4 +76,9 @@ public Member updateProfileImage(String profileImage) {
         this.profileImage = profileImage;
         return this;
     }
+
+    public Member updateMemberRole(MemberRole memberRole) {
+        this.memberRole = memberRole;
+        return this;
+    }
 }
diff --git a/src/main/java/com/cotato/squadus/domain/auth/service/EmailSendService.java b/src/main/java/com/cotato/squadus/domain/auth/service/EmailSendService.java
@@ -3,6 +3,7 @@
 import com.cotato.squadus.common.config.RedisConfig;
 import com.cotato.squadus.common.config.auth.CustomOAuth2Member;
 import com.cotato.squadus.domain.auth.entity.Member;
+import com.cotato.squadus.domain.auth.enums.MemberRole;
 import com.cotato.squadus.domain.auth.enums.SchoolDomain;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
@@ -99,13 +100,14 @@ public Boolean checkAuthNum(String email, String authNum, @AuthenticationPrincip
             // 회원의 university 필드를 업데이트
             Member memberByUniqueId = memberService.findMemberByUniqueId(customOauth2Member.getUniqueId());
             memberByUniqueId.updateUniversity(universityName);
+            memberByUniqueId.updateMemberRole(MemberRole.CERTIFIED_MEMBER);
             memberService.saveMember(memberByUniqueId);
             log.info("사용자 {}의 university 필드가 {}로 업데이트 되었습니다.", memberByUniqueId.getUsername(), universityName);
+            log.info("사용자 {}의 memberRole 필드가 {}로 업데이트 되었습니다.", memberByUniqueId.getUsername(), MemberRole.CERTIFIED_MEMBER);
         }
 
         return isAuthSuccessful;
     }
-
     private boolean isValidSchoolEmail(String email) {
         if (email == null || !email.contains("@")) {
             return false;