Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 닉네임 검증 #345

Merged
merged 2 commits into from
Aug 15, 2024
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
@@ -1,28 +1,24 @@
package mouda.backend.auth.controller;

import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import lombok.RequiredArgsConstructor;
import mouda.backend.auth.dto.request.LoginRequest;
import mouda.backend.auth.dto.request.OauthRequest;
import mouda.backend.auth.dto.response.LoginResponse;
import mouda.backend.auth.service.AuthService;
import mouda.backend.common.RestResponse;
import mouda.backend.member.domain.Member;
import mouda.backend.member.repository.MemberRepository;

@RestController
@RequestMapping("/v1/auth")
@RequiredArgsConstructor
public class AuthController implements AuthSwagger {

private final AuthService authService;
private final MemberRepository memberRepository;

@Override
@PostMapping("/login")
Expand All @@ -32,16 +28,9 @@ public ResponseEntity<RestResponse<LoginResponse>> login(@RequestBody LoginReque
return ResponseEntity.ok().body(new RestResponse<>(response));
}

@GetMapping("/kakao/oauth")
public String kakao(
@RequestParam("code") String code,
@RequestParam(value = "error", required = false) String error,
@RequestParam(value = "error_description", required = false) String error_description,
@RequestParam(value = "state", required = false) String state
) {
System.out.println(code);
Member member = new Member(code);
memberRepository.save(member);
return code;
@PostMapping("/kakao/oauth")
public String kakao(@RequestBody OauthRequest oauthRequest) {
return authService.oauthLogin(oauthRequest.code());

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package mouda.backend.auth.dto.request;

public record OauthRequest(
String code
) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package mouda.backend.auth.dto.response;

public record OauthResponse(
String id_token
) {
}
123 changes: 87 additions & 36 deletions backend/src/main/java/mouda/backend/auth/service/AuthService.java
Original file line number Diff line number Diff line change
@@ -1,50 +1,101 @@
package mouda.backend.auth.service;

import java.util.Base64;
import java.util.HashMap;
import java.util.Map;

import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClient;

import com.fasterxml.jackson.databind.ObjectMapper;

import mouda.backend.auth.dto.request.LoginRequest;
import mouda.backend.auth.dto.response.LoginResponse;
import mouda.backend.auth.dto.response.OauthResponse;
import mouda.backend.auth.exception.AuthErrorMessage;
import mouda.backend.auth.exception.AuthException;
import mouda.backend.member.domain.Member;
import mouda.backend.member.repository.MemberRepository;
import mouda.backend.security.JwtProvider;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;

@Service
public class AuthService {

private final JwtProvider jwtProvider;

private final MemberRepository memberRepository;


public AuthService(JwtProvider jwtProvider, MemberRepository memberRepository) {
this.jwtProvider = jwtProvider;
this.memberRepository = memberRepository;
}

public LoginResponse login(LoginRequest loginRequest) {
return memberRepository.findByNickname(loginRequest.nickname())
.map(member -> {
String token = jwtProvider.createToken(member);
return new LoginResponse(token);
})
.orElseGet(() -> {
Member newMember = new Member(loginRequest.nickname());
memberRepository.save(newMember);
String token = jwtProvider.createToken(newMember);
return new LoginResponse(token);
});
}

public Member findMember(String token) {
long memberId = jwtProvider.extractMemberId(token);
return memberRepository.findById(memberId)
.orElseThrow(
() -> new AuthException(HttpStatus.UNAUTHORIZED, AuthErrorMessage.UNAUTHORIZED));
}

public void checkAuthentication(String token) {
jwtProvider.validateExpiration(token);
}
private final JwtProvider jwtProvider;

private final MemberRepository memberRepository;
private final RestClient restClient;

public AuthService(JwtProvider jwtProvider, MemberRepository memberRepository, RestClient restClient) {
this.jwtProvider = jwtProvider;
this.memberRepository = memberRepository;
this.restClient = restClient;
}

public LoginResponse login(LoginRequest loginRequest) {
return memberRepository.findByNickname(loginRequest.nickname())
.map(member -> {
String token = jwtProvider.createToken(member);
return new LoginResponse(token);
})
.orElseGet(() -> {
Member newMember = new Member(loginRequest.nickname());
memberRepository.save(newMember);
String token = jwtProvider.createToken(newMember);
return new LoginResponse(token);
});
}

public Member findMember(String token) {
long memberId = jwtProvider.extractMemberId(token);
return memberRepository.findById(memberId)
.orElseThrow(
() -> new AuthException(HttpStatus.UNAUTHORIZED, AuthErrorMessage.UNAUTHORIZED));
}

public void checkAuthentication(String token) {
jwtProvider.validateExpiration(token);
}

public String oauthLogin(String code) {
OauthResponse oauthResponse = restClient.post()
.uri("/oauth/token")
.header("Content-type", "application/x-www-form-urlencoded;charset=utf-8")
.body(token(code))
.retrieve()
.body(OauthResponse.class);

String kakaoIdToken = oauthResponse.id_token();
try {
// JWT는 점(.)으로 구분된 세 부분으로 이루어져 있다
String[] parts = kakaoIdToken.split("\\.");
if (parts.length != 3) {
throw new IllegalArgumentException("Invalid JWT token format");
}
// 두 번째 부분이 payload이다.
String payload = parts[1];
// Base64Url 디코딩 (Base64Url은 표준 Base64와 약간 다름)
byte[] decodedBytes = Base64.getUrlDecoder().decode(payload);
// 디코딩된 바이트 배열을 문자열로 변환
String decodedPayload = new String(decodedBytes);
// JSON 파싱하여 Map으로 변환
ObjectMapper objectMapper = new ObjectMapper();
Map payloadJson = objectMapper.readValue(decodedPayload, Map.class);
String nickname = payloadJson.get("nickname").toString();
return nickname;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}

private Map<String, String> token(String code) {
HashMap<String, String> map = new HashMap<>();
map.put("grant_type", "authorization_code");
map.put("client_id", "ca3adf9a52671fdbb847b809c0fdb980");
map.put("redirect_uri", "https://dev.mouda.site/v1/auth/kakao/oauth");
map.put("code", code);
return map;
}
}
16 changes: 16 additions & 0 deletions backend/src/main/java/mouda/backend/config/RestClientConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package mouda.backend.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestClient;

@Configuration
public class RestClientConfig {

@Bean
public RestClient tossPaymentRestClient() {
return RestClient.builder()
.baseUrl("https://kauth.kakao.com")
.build();
}
}
8 changes: 4 additions & 4 deletions backend/src/main/java/mouda/backend/config/WebMvcConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(apiRequestLoggingInterceptor);
//
// registry.addInterceptor(authenticationCheckInterceptor)
// .addPathPatterns("/v1/**")
// .excludePathPatterns("/v1/auth/login");

registry.addInterceptor(authenticationCheckInterceptor)
.addPathPatterns("/v1/**")
.excludePathPatterns("/v1/auth/kakao/oauth", "/v1/auth/login");
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions backend/src/main/java/mouda/backend/member/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ private void validateNickname(String nickname) {
if (nickname.isBlank()) {
throw new MoimException(HttpStatus.BAD_REQUEST, MoimErrorMessage.MEMBER_NICKNAME_NOT_EXISTS);
}
// if (nickname.length() >= NICKNAME_MAX_LENGTH) {
// throw new MoimException(HttpStatus.BAD_REQUEST, MoimErrorMessage.MEMBER_NICKNAME_TOO_LONG);
// }
if (nickname.length() >= NICKNAME_MAX_LENGTH) {
throw new MoimException(HttpStatus.BAD_REQUEST, MoimErrorMessage.MEMBER_NICKNAME_TOO_LONG);
}
}

public void joinMoim(Moim moim) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ void failToCreateMemberWhenNicknameIsBlank() {
.build());
}

// @DisplayName("닉네임이 제한 길이를 초과하여 회원 생성에 실패한다.")
// @Test
// void failToCreateMemberWhenNicknameIsTooLong() {
// String longNickname = "a".repeat(11);
// Assertions.assertThrows(MoimException.class, () -> Member.builder()
// .nickname(longNickname)
// .build());
// }
@DisplayName("닉네임이 제한 길이를 초과하여 회원 생성에 실패한다.")
@Test
void failToCreateMemberWhenNicknameIsTooLong() {
String longNickname = "a".repeat(11);
Assertions.assertThrows(MoimException.class, () -> Member.builder()
.nickname(longNickname)
.build());
}
}