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: Kakao Auth #26

Merged
merged 19 commits into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from 16 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
9 changes: 9 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ checkstyle {
configProperties = ["suppressionFile": "checkstyle/naver-checkstyle-suppressions.xml"]
}

dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-dependencies:2021.0.8"
}
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
Expand All @@ -52,6 +57,8 @@ dependencies {

implementation 'org.springframework.boot:spring-boot-starter-data-jpa'

implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'

// sentry dependency
implementation 'io.sentry:sentry-spring-boot-starter:6.23.0'
implementation 'io.sentry:sentry-logback:6.23.0'
Expand All @@ -67,6 +74,8 @@ dependencies {

runtimeOnly 'com.mysql:mysql-connector-j'

//implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/com/universe/uni/config/AuthConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.universe.uni.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;

import lombok.Getter;

@Getter
@Configuration
public class AuthConfig {
@Value("${oauth.kakao.client.id}")
private String kakaoClientId;

@Value("${oauth.kakao.client.secret}")
private String kakaoClientSecret;

@Value("${oauth.kakao.redirect.auth}")
private String kakaoRedirectAuth;
}
12 changes: 12 additions & 0 deletions src/main/java/com/universe/uni/config/FeignConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.universe.uni.config;

import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;

import lombok.RequiredArgsConstructor;

@EnableFeignClients(basePackages = "com.universe.uni.external")
@RequiredArgsConstructor
@Configuration
public class FeignConfig {
}
24 changes: 24 additions & 0 deletions src/main/java/com/universe/uni/controller/AuthController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.universe.uni.controller;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.universe.uni.dto.AuthTokenDto;
import com.universe.uni.service.AuthServiceContract;

import lombok.RequiredArgsConstructor;

@RestController
@RequiredArgsConstructor
@RequestMapping("auth")
public class AuthController {

private final AuthServiceContract authService;

@GetMapping("kakao")
public AuthTokenDto redirectKakaoAuth(@RequestParam(name = "code") String authenticationCode) {
return authService.authWithKakao(authenticationCode);
}
}
9 changes: 9 additions & 0 deletions src/main/java/com/universe/uni/dto/AuthTokenDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.universe.uni.dto;

import com.fasterxml.jackson.annotation.JsonProperty;

public record AuthTokenDto(
@JsonProperty("access_token") String accessToken,
@JsonProperty("refresh_token") String refreshToken
) {
}
14 changes: 14 additions & 0 deletions src/main/java/com/universe/uni/external/KakaoApiClient.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.universe.uni.external;

import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestHeader;

import com.universe.uni.external.response.KakaoUserResponse;

@FeignClient(value = "kakaoApiClient", url = "${oauth.kakao.url.api}")
public interface KakaoApiClient {
@GetMapping(value = "/v2/user/me", consumes = MediaType.APPLICATION_JSON_VALUE)
KakaoUserResponse getUser(@RequestHeader("Authorization") String token);
}
17 changes: 17 additions & 0 deletions src/main/java/com/universe/uni/external/KakaoAuthClient.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.universe.uni.external;

import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

import com.universe.uni.external.request.KakaoAuthRequest;
import com.universe.uni.external.response.KakaoAuthResponse;

@FeignClient(value = "kakaoAuthClient", url = "${oauth.kakao.url.auth}")
public interface KakaoAuthClient {
@PostMapping(value = "/oauth/token", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
KakaoAuthResponse requestAuthToken(
@RequestBody KakaoAuthRequest body
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.universe.uni.external.request;

import feign.form.FormProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;

@Builder
@AllArgsConstructor
public class KakaoAuthRequest {
@FormProperty("code")
private String code;
@FormProperty("grant_type")
private String grantType;
@FormProperty("client_id")
private String clientId;
@FormProperty("client_secret")
private String clientSecret;
@FormProperty("redirect_uri")
private String redirectUri;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.universe.uni.external.response;

import com.fasterxml.jackson.annotation.JsonProperty;

public record KakaoAuthResponse(
@JsonProperty("access_token")
String accessToken,
@JsonProperty("token_type")
String tokenType,
@JsonProperty("refresh_token")
String refreshToken,
@JsonProperty("expires_in")
Long expiresIn,
@JsonProperty("scope")
String scope,
@JsonProperty("refresh_token_expires_in")
Long refreshTokenExpiresIn

) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.universe.uni.external.response;

import com.fasterxml.jackson.annotation.JsonProperty;

public record KakaoUserResponse(
@JsonProperty("id")
Long id,
@JsonProperty("kakao_account")
KaKaoAccount kakaoAccount
) {
public boolean isEmailNeedsAgreement() {
if (kakaoAccount == null) {
return false;
}
return (kakaoAccount.hasEmail && kakaoAccount.isEmailVerified && kakaoAccount.isEmailValid);
}

public record KaKaoAccount(
@JsonProperty("has_email")
boolean hasEmail,
@JsonProperty("email_needs_agreement")
boolean emailNeedsAgreement,
@JsonProperty("is_email_valid")
boolean isEmailValid,
@JsonProperty("is_email_verified")
boolean isEmailVerified,
@JsonProperty("email")
String email
) {
}
}
10 changes: 10 additions & 0 deletions src/main/java/com/universe/uni/repository/KakaoRepository.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.universe.uni.repository;

import com.universe.uni.external.response.KakaoAuthResponse;
import com.universe.uni.external.response.KakaoUserResponse;

public interface KakaoRepository {
KakaoAuthResponse fetchTokenBy(String code);

KakaoUserResponse getUser(String accessToken);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.universe.uni.repository;

import org.springframework.stereotype.Repository;

import com.universe.uni.config.AuthConfig;
import com.universe.uni.external.KakaoApiClient;
import com.universe.uni.external.KakaoAuthClient;
import com.universe.uni.external.request.KakaoAuthRequest;
import com.universe.uni.external.response.KakaoAuthResponse;
import com.universe.uni.external.response.KakaoUserResponse;

import lombok.RequiredArgsConstructor;

@Repository
@RequiredArgsConstructor
public class RemoteKakaoRepository implements KakaoRepository {
private final AuthConfig authConfig;
private final KakaoAuthClient kakaoAuthClient;
private final KakaoApiClient kakaoApiClient;

@Override
public KakaoAuthResponse fetchTokenBy(String code) {
final KakaoAuthRequest request = KakaoAuthRequest.builder()
.code(code)
.grantType("authorization_code")
.clientId(authConfig.getKakaoClientId())
.clientSecret(authConfig.getKakaoClientSecret())
.redirectUri(authConfig.getKakaoRedirectAuth())
.build();
return kakaoAuthClient.requestAuthToken(request);
}

@Override
public KakaoUserResponse getUser(String accessToken) {
final String token = "Bearer " + accessToken;
return kakaoApiClient.getUser(token);
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package com.universe.uni.repository;

import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;

import com.universe.uni.domain.entity.User;

public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findBySnsAuthCode(String snsAuthCode);
}
45 changes: 45 additions & 0 deletions src/main/java/com/universe/uni/service/AuthService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.universe.uni.service;

import javax.transaction.Transactional;

import org.springframework.stereotype.Service;

import com.universe.uni.domain.SnsType;
import com.universe.uni.domain.entity.User;
import com.universe.uni.dto.AuthTokenDto;
import com.universe.uni.external.response.KakaoAuthResponse;
import com.universe.uni.external.response.KakaoUserResponse;
import com.universe.uni.repository.KakaoRepository;
import com.universe.uni.repository.UserRepository;

import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
public class AuthService implements AuthServiceContract {

private final JwtManager jwtManager;
private final KakaoRepository kakaoRepository;
private final UserRepository userRepository;

@Override
@Transactional
public AuthTokenDto authWithKakao(String code) {
final KakaoAuthResponse kakaoToken = kakaoRepository.fetchTokenBy(code);
final KakaoUserResponse kakaoUser = kakaoRepository.getUser(kakaoToken.accessToken());
final User user = userRepository.findBySnsAuthCode(kakaoUser.id().toString())
.orElseGet(() -> userRepository.save(registerKakaoUser(kakaoUser)));
return beIssuedAuthToken(user.getId());
}

private User registerKakaoUser(KakaoUserResponse kakaoUser) {
return User.builder()
.snsType(SnsType.KAKAO)
.snsAuthCode(kakaoUser.id().toString())
.build();
}

private AuthTokenDto beIssuedAuthToken(long userId) {
return jwtManager.issueToken(userId);
}
}
10 changes: 10 additions & 0 deletions src/main/java/com/universe/uni/service/AuthServiceContract.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.universe.uni.service;

import javax.transaction.Transactional;

import com.universe.uni.dto.AuthTokenDto;

public interface AuthServiceContract {
@Transactional
AuthTokenDto authWithKakao(String code);
}
7 changes: 5 additions & 2 deletions src/main/java/com/universe/uni/service/JwtManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import com.universe.uni.dto.AuthTokenDto;
import com.universe.uni.exception.UnauthorizedException;
import com.universe.uni.exception.dto.ErrorType;

Expand Down Expand Up @@ -41,7 +42,7 @@ protected void init() {
.encodeToString(jwtSecret.getBytes(StandardCharsets.UTF_8));
}

public String issueToken(String userId) {
public AuthTokenDto issueToken(Long userId) {
ZoneId seoulZoneId = ZoneId.of("Asia/Seoul");
OffsetDateTime now = OffsetDateTime.now(seoulZoneId);
OffsetDateTime expiration = now.plusSeconds(accessTokenExpiryPeriod);
Expand All @@ -53,11 +54,13 @@ public String issueToken(String userId) {

claims.put("userId", userId);

return Jwts.builder()
String accessToken = Jwts.builder()
.setHeaderParam(Header.TYPE, Header.JWT_TYPE)
.setClaims(claims)
.signWith(getSigningKey())
.compact();

return new AuthTokenDto(accessToken, null);
}

private Date toDate(OffsetDateTime offsetDateTime) {
Expand Down
Loading