Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ import org.springframework.beans.factory.annotation.Value
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.RequestHeader
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController

@RestController
@RequestMapping("/internal-api/v1/members")
class InternalMemberController(
private val memberService: MemberService,
@Value("\${app.internal.secret}") private val internalSecret: String,
Expand All @@ -21,7 +19,7 @@ class InternalMemberController(
private val log = LoggerFactory.getLogger(InternalMemberController::class.java)
}

@GetMapping("/{userId}")
@GetMapping("/internal-api/v1/members/{userId}")
fun getUserInfo(
@PathVariable userId: String,
@RequestHeader("X-Internal-Secret") secret: String,
Expand All @@ -37,12 +35,14 @@ class InternalMemberController(
userId = userInfo.userId,
email = userInfo.email,
nickname = userInfo.nickname,
phoneNumber = userInfo.phoneNumber,
))
}

data class UserInfoResponse(
val userId: String,
val email: String,
val nickname: String,
val phoneNumber: String?,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class MemberController(
userId = result.userId,
nickname = result.nickname,
email = result.email,
phoneNumber = result.phoneNumber,
linkedProviders = result.providers
)
return CommonResponse.success(message = "회원 정보 조회 성공", data = resp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ data class UserInfoResponseDto(
val userId: String,
val nickname: String,
val email: String,
val phoneNumber: String?,
val linkedProviders: List<ProviderType>
)
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,35 @@ class SocialLoginMemberProcessor(
providerType
)?.let { existingAuthProvider ->
log.info { "기존 회원 발견: ${existingAuthProvider.member.opaqueId}" }
Pair(existingAuthProvider.member, false)
val existingMember = existingAuthProvider.member
updatePhoneNumberIfChanged(existingMember, oauthUser)
Pair(existingMember, false)
} ?: run {
log.info { "신규 회원 생성: ${oauthUser.email}" }
val newMember = MemberEntity.createSocialMember(
nickname = oauthUser.getNickname(),
isEmailVerified = oauthUser.verifiedEmail,
primaryEmail = oauthUser.email
primaryEmail = oauthUser.email,
phoneNumber = oauthUser.phoneNumber
)
val savedMember = memberRepository.save(newMember)
log.info { "신규 회원 생성 완료: ${savedMember.opaqueId}" }
Pair(savedMember, true)
}
}

/**
* 소셜 제공자가 전달한 전화번호가 있으면 항상 최신 값으로 갱신합니다.
*/
private fun updatePhoneNumberIfChanged(member: MemberEntity, oauthUser: OAuthUser) {
val phoneNumber = oauthUser.phoneNumber
if (!phoneNumber.isNullOrBlank() && member.phoneNumber != phoneNumber) {
member.updatePhoneNumber(phoneNumber)
memberRepository.save(member)
log.info { "회원 전화번호 갱신 완료: ${member.opaqueId}" }
}
}

private fun createOrUpdateAuthProvider(
member: MemberEntity,
oauthUser: OAuthUser,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class MemberService(
val userId: String,
val nickname: String,
val email: String,
val phoneNumber: String?,
val providers: List<ProviderType>,
)

Expand Down Expand Up @@ -65,6 +66,7 @@ class MemberService(
userId = member.opaqueId,
nickname = member.nickname,
email = email!!,
phoneNumber = member.phoneNumber,
providers = providers
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open class MemberEntity protected constructor(
val primaryEmail: String? = null,

@Column(name = "phone_number", length = 20, nullable = true)
val phoneNumber: String? = null,
var phoneNumber: String? = null,

@Column(name = "opaque_id", nullable = false, unique = true, length = 36)
val opaqueId: String,
Expand Down Expand Up @@ -69,6 +69,7 @@ open class MemberEntity protected constructor(
nickname: String,
isEmailVerified: Boolean = true,
primaryEmail: String,
phoneNumber: String? = null,
): MemberEntity {
require(nickname.isNotBlank()) { "닉네임은 필수입니다" }
require(nickname.length <= 100) { "닉네임은 100자를 초과할 수 없습니다" }
Expand All @@ -77,7 +78,8 @@ open class MemberEntity protected constructor(
opaqueId = UuidCreator.getTimeOrdered().toString(),
nickname = nickname.trim(),
isEmailVerified = isEmailVerified,
primaryEmail = primaryEmail
primaryEmail = primaryEmail,
phoneNumber = phoneNumber
)
}
}
Expand All @@ -89,6 +91,13 @@ open class MemberEntity protected constructor(
this.isEmailVerified = true
}

/**
* 전화번호 업데이트
*/
fun updatePhoneNumber(phoneNumber: String) {
this.phoneNumber = phoneNumber
}

/**
* 최근 로그인 시간 업데이트
*/
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/com/wq/auth/api/domain/oauth/OAuthUser.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ data class OAuthUser(
val verifiedEmail: Boolean,
val name: String?,
val givenName: String? = null,
val phoneNumber: String? = null,
val providerType: ProviderType
) {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ class NaverOAuthClient(
verifiedEmail = naverUserInfo.response.email != null,
name = naverUserInfo.response.name,
givenName = naverUserInfo.response.nickname, // 네이버는 givenName이 없으므로 nickname 사용
phoneNumber = naverUserInfo.response.getNormalizedMobile(),
providerType = ProviderType.NAVER
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,12 @@ data class NaverUserInfo(
* Naver 제공자 ID를 반환합니다.
*/
fun getProviderId(): String = id

/**
* mobile 값을 숫자만 남긴 형태로 정규화하여 반환합니다. (예: "010-1234-5678" -> "01012345678")
*/
fun getNormalizedMobile(): String? {
val digits = mobile?.filter { it.isDigit() }
return if (digits.isNullOrBlank()) null else digits
}
}
Loading
Loading