-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature: 회원가입 및 로그인 구현
- Loading branch information
Showing
20 changed files
with
497 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,3 +41,4 @@ out/ | |
|
||
### generated ### | ||
src/main/generated/ | ||
*/.jqwik-database |
36 changes: 36 additions & 0 deletions
36
cakk-api/src/main/java/com/cakk/api/controller/user/SignController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package com.cakk.api.controller.user; | ||
|
||
import jakarta.validation.Valid; | ||
|
||
import org.springframework.web.bind.annotation.PostMapping; | ||
import org.springframework.web.bind.annotation.RequestBody; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
|
||
import com.cakk.api.dto.request.user.UserSignInRequest; | ||
import com.cakk.api.dto.request.user.UserSignUpRequest; | ||
import com.cakk.api.dto.response.user.JwtResponse; | ||
import com.cakk.api.service.user.UserService; | ||
import com.cakk.common.response.ApiResponse; | ||
|
||
@RestController | ||
@RequiredArgsConstructor | ||
public class SignController { | ||
|
||
private final UserService userService; | ||
|
||
@PostMapping("/sign-up") | ||
public ApiResponse<JwtResponse> signUp( | ||
@Valid @RequestBody UserSignUpRequest request | ||
) { | ||
return ApiResponse.success(userService.signUp(request)); | ||
} | ||
|
||
@PostMapping("/sign-in") | ||
public ApiResponse<JwtResponse> signIn( | ||
@Valid @RequestBody UserSignInRequest request | ||
) { | ||
return ApiResponse.success(userService.signIn(request)); | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignInRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.cakk.api.dto.request.user; | ||
|
||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.NotNull; | ||
|
||
import com.cakk.common.enums.Provider; | ||
|
||
public record UserSignInRequest( | ||
@NotNull | ||
Provider provider, | ||
@NotBlank | ||
String idToken | ||
) { | ||
} |
27 changes: 27 additions & 0 deletions
27
cakk-api/src/main/java/com/cakk/api/dto/request/user/UserSignUpRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package com.cakk.api.dto.request.user; | ||
|
||
import java.time.LocalDate; | ||
|
||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.NotNull; | ||
|
||
import com.cakk.common.enums.Gender; | ||
import com.cakk.common.enums.Provider; | ||
|
||
public record UserSignUpRequest( | ||
@NotNull | ||
Provider provider, | ||
@NotBlank | ||
String idToken, | ||
String deviceOs, | ||
String deviceToken, | ||
@NotBlank | ||
String nickname, | ||
@NotBlank | ||
String email, | ||
@NotNull | ||
LocalDate birthday, | ||
@NotNull | ||
Gender gender | ||
) { | ||
} |
14 changes: 14 additions & 0 deletions
14
cakk-api/src/main/java/com/cakk/api/dto/response/user/JwtResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.cakk.api.dto.response.user; | ||
|
||
import com.cakk.api.vo.JsonWebToken; | ||
|
||
public record JwtResponse( | ||
String accessToken, | ||
String refreshToken, | ||
String grantType | ||
) { | ||
|
||
public static JwtResponse from(JsonWebToken jwt) { | ||
return new JwtResponse(jwt.accessToken(), jwt.refreshToken(), jwt.grantType()); | ||
} | ||
} |
26 changes: 26 additions & 0 deletions
26
cakk-api/src/main/java/com/cakk/api/mapper/UserMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package com.cakk.api.mapper; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.NoArgsConstructor; | ||
|
||
import com.cakk.api.dto.request.user.UserSignUpRequest; | ||
import com.cakk.common.enums.Role; | ||
import com.cakk.domain.entity.user.User; | ||
|
||
@NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public class UserMapper { | ||
|
||
public static User supplyUserBy(UserSignUpRequest dto, String providerId) { | ||
return User.builder() | ||
.provider(dto.provider()) | ||
.providerId(providerId) | ||
.nickname(dto.nickname()) | ||
.email(dto.email()) | ||
.gender(dto.gender()) | ||
.birthday(dto.birthday()) | ||
.deviceOs(dto.deviceOs()) | ||
.deviceToken(dto.deviceToken()) | ||
.role(Role.USER) | ||
.build(); | ||
} | ||
} |
33 changes: 33 additions & 0 deletions
33
cakk-api/src/main/java/com/cakk/api/service/user/UserService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,43 @@ | ||
package com.cakk.api.service.user; | ||
|
||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
|
||
import com.cakk.api.dto.request.user.UserSignInRequest; | ||
import com.cakk.api.dto.request.user.UserSignUpRequest; | ||
import com.cakk.api.dto.response.user.JwtResponse; | ||
import com.cakk.api.factory.OidcProviderFactory; | ||
import com.cakk.api.mapper.UserMapper; | ||
import com.cakk.api.provider.jwt.JwtProvider; | ||
import com.cakk.domain.entity.user.User; | ||
import com.cakk.domain.repository.reader.UserReader; | ||
import com.cakk.domain.repository.writer.UserWriter; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class UserService { | ||
|
||
private final OidcProviderFactory oidcProviderFactory; | ||
private final JwtProvider jwtProvider; | ||
|
||
private final UserReader userReader; | ||
private final UserWriter userWriter; | ||
|
||
@Transactional | ||
public JwtResponse signUp(UserSignUpRequest dto) { | ||
final String providerId = oidcProviderFactory.getProviderId(dto.provider(), dto.idToken()); | ||
final User user = userWriter.create(UserMapper.supplyUserBy(dto, providerId)); | ||
|
||
return JwtResponse.from(jwtProvider.generateToken(user)); | ||
} | ||
|
||
@Transactional(readOnly = true) | ||
public JwtResponse signIn(UserSignInRequest dto) { | ||
final String providerId = oidcProviderFactory.getProviderId(dto.provider(), dto.idToken()); | ||
final User user = userReader.findByProviderId(providerId); | ||
|
||
return JwtResponse.from(jwtProvider.generateToken(user)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
cakk-api/src/test/java/com/cakk/api/common/base/IntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package com.cakk.api.common.base; | ||
|
||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
import org.springframework.boot.test.web.client.TestRestTemplate; | ||
import org.springframework.test.context.ActiveProfiles; | ||
|
||
import com.navercorp.fixturemonkey.FixtureMonkey; | ||
import com.navercorp.fixturemonkey.api.introspector.BuilderArbitraryIntrospector; | ||
import com.navercorp.fixturemonkey.api.introspector.ConstructorPropertiesArbitraryIntrospector; | ||
import com.navercorp.fixturemonkey.api.introspector.FieldReflectionArbitraryIntrospector; | ||
|
||
@ActiveProfiles("test") | ||
@SpringBootTest( | ||
properties = "spring.profiles.active: test", | ||
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT | ||
) | ||
public abstract class IntegrationTest { | ||
|
||
@Autowired | ||
protected TestRestTemplate restTemplate; | ||
|
||
protected final FixtureMonkey getConstructorMonkey() { | ||
return FixtureMonkey.builder() | ||
.objectIntrospector(ConstructorPropertiesArbitraryIntrospector.INSTANCE) | ||
.build(); | ||
} | ||
|
||
protected final FixtureMonkey getReflectionMonkey() { | ||
return FixtureMonkey.builder() | ||
.objectIntrospector(FieldReflectionArbitraryIntrospector.INSTANCE) | ||
.build(); | ||
} | ||
|
||
protected final FixtureMonkey getBuilderMonkey() { | ||
return FixtureMonkey.builder() | ||
.objectIntrospector(BuilderArbitraryIntrospector.INSTANCE) | ||
.build(); | ||
} | ||
} |
37 changes: 37 additions & 0 deletions
37
cakk-api/src/test/java/com/cakk/api/common/base/ServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package com.cakk.api.common.base; | ||
|
||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.mockito.junit.jupiter.MockitoExtension; | ||
import org.springframework.context.annotation.Import; | ||
import org.springframework.test.context.ActiveProfiles; | ||
|
||
import com.navercorp.fixturemonkey.FixtureMonkey; | ||
import com.navercorp.fixturemonkey.api.introspector.BuilderArbitraryIntrospector; | ||
import com.navercorp.fixturemonkey.api.introspector.ConstructorPropertiesArbitraryIntrospector; | ||
import com.navercorp.fixturemonkey.api.introspector.FieldReflectionArbitraryIntrospector; | ||
|
||
import com.cakk.domain.config.JpaConfig; | ||
|
||
@Import(JpaConfig.class) | ||
@ActiveProfiles("test") | ||
@ExtendWith(MockitoExtension.class) | ||
public abstract class ServiceTest { | ||
|
||
protected final FixtureMonkey getConstructorMonkey() { | ||
return FixtureMonkey.builder() | ||
.objectIntrospector(ConstructorPropertiesArbitraryIntrospector.INSTANCE) | ||
.build(); | ||
} | ||
|
||
protected final FixtureMonkey getReflectionMonkey() { | ||
return FixtureMonkey.builder() | ||
.objectIntrospector(FieldReflectionArbitraryIntrospector.INSTANCE) | ||
.build(); | ||
} | ||
|
||
protected final FixtureMonkey getBuilderMonkey() { | ||
return FixtureMonkey.builder() | ||
.objectIntrospector(BuilderArbitraryIntrospector.INSTANCE) | ||
.build(); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
cakk-api/src/test/java/com/cakk/api/common/container/MysqlTestContainer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package com.cakk.api.common.container; | ||
|
||
import org.testcontainers.containers.MySQLContainer; | ||
import org.testcontainers.junit.jupiter.Container; | ||
import org.testcontainers.junit.jupiter.Testcontainers; | ||
|
||
@Testcontainers | ||
public abstract class MysqlTestContainer { | ||
|
||
private static final String MYSQL_VERSION = "mysql:8"; | ||
private static final String DATABASE_NAME = "cakk"; | ||
|
||
@Container | ||
public static final MySQLContainer MYSQL_CONTAINER = new MySQLContainer(MYSQL_VERSION) | ||
.withDatabaseName(DATABASE_NAME); | ||
|
||
static { | ||
MYSQL_CONTAINER.start(); | ||
} | ||
} |
Oops, something went wrong.