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] 카카오 로그인 및 로그아웃 구현 #31

Merged
merged 20 commits into from
Jan 10, 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
56 changes: 33 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,48 @@ repositories {
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation 'org.springframework.boot:spring-boot-starter-test'

// lombok
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
// lombok
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

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

// spring security
implementation 'org.springframework.boot:spring-boot-starter-security'
// spring security
implementation 'org.springframework.boot:spring-boot-starter-security'

// jwt
implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
// jwt
implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'

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

// open graph
implementation 'net.sourceforge.htmlcleaner:htmlcleaner:2.6'
//oauth2
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'

implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation('nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect')
// gson
implementation 'com.google.code.gson:gson:2.8.9'

// aws
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
//redis
implementation 'org.springframework.boot:spring-boot-starter-data-redis'

// open graph
implementation 'net.sourceforge.htmlcleaner:htmlcleaner:2.6'

implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation('nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect')

// aws
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
}

tasks.named('test') {
useJUnitPlatform()
useJUnitPlatform()
}

Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ public ResponseEntity<SuccessResponse<?>> getToken(@PathVariable Long memberId){
final MemberTokenResponseDto memberTokenResponseDto = memberService.getToken(memberId);
return SuccessResponse.created(memberTokenResponseDto);
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package org.sopt.sweet.domain.member.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.headers.Header;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.sopt.sweet.global.common.SuccessResponse;
import org.sopt.sweet.global.config.auth.UserId;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

@Tag(name = "소셜로그인", description = "소셜로그인 관련 API")
public interface OAuthApi {

@Operation(
summary = "카카오 로그인",
responses = {
@ApiResponse(
responseCode = "200",
content = @Content(
mediaType = "application/json",
schema = @Schema(implementation = SuccessResponse.class)
)
)
}
)
@PostMapping("/kakao/login")
ResponseEntity<SuccessResponse<?>> kakaoLogin(
@Parameter(
description = "redirect_uri로부터 받은 인가 코드",
required = true,
example = "gGMvN1u_dgHdTizP8uUf7HZHNls_3G4X8qbKTwihE0x5W6f3E6acGDDsc80KPXLrAAABjO-2eHHUNEQ5evY1pg"
)
@RequestParam("code") String code
);

@ApiResponses(
value = {
@ApiResponse(responseCode = "200"),
@ApiResponse(responseCode = "404", content = @Content)
}
)
@Operation(summary = "카카오 로그아웃")
@PostMapping("/api/oauth/kakao/logout")
ResponseEntity<SuccessResponse<?>> kakaoLogout(
@RequestHeader("Authorization") String accessToken,
@Parameter(
description = "멤버 아이디",
required = true,
example = "1"
)
@RequestBody String memberId
);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package org.sopt.sweet.domain.member.controller;

import lombok.RequiredArgsConstructor;
import org.sopt.sweet.domain.member.dto.response.KakaoUserInfoResponseDto;
import org.sopt.sweet.domain.member.dto.response.MemberTokenResponseDto;
import org.sopt.sweet.domain.member.service.OAuthService;
import org.sopt.sweet.global.common.SuccessResponse;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

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


@RequiredArgsConstructor
@RequestMapping("/api/oauth")
@RestController
public class OAuthController implements OAuthApi {
private final OAuthService oAuthService;

@PostMapping("/kakao/login")
public ResponseEntity<SuccessResponse<?>> kakaoLogin(@RequestParam("code") String code) {
KakaoUserInfoResponseDto userInfo = oAuthService.kakaoCallback(code);
MemberTokenResponseDto memberToken = oAuthService.saveToken(userInfo.socialId());

Map<String, Object> loginResponse = new HashMap<>();
loginResponse.put("userInfo", userInfo);
loginResponse.put("memberToken", memberToken);

return SuccessResponse.ok(loginResponse);
}


@PostMapping("/kakao/logout")
public ResponseEntity<SuccessResponse<?>> kakaoLogout(@RequestHeader("Authorization") String accessToken,@RequestBody String socialId) {
oAuthService.kakaoLogout(accessToken, socialId);
return SuccessResponse.ok("로그아웃 성공");
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package org.sopt.sweet.domain.member.dto.response;


import org.sopt.sweet.domain.member.entity.Member;


public record KakaoUserInfoResponseDto(
Long memberId,
Long socialId,
String nickname,
String profileImage
) {


KakaoUserInfoResponseDto of(Member member) {
return new KakaoUserInfoResponseDto(
member.getId(),
member.getSocialId(),
member.getNickName(),
member.getProfileImg()
);
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@

@Builder
public record MemberTokenResponseDto(
Long memberId,
String accessToken,
String refreshToken
) {
public static MemberTokenResponseDto of(Long memberId,
String accessToken,
String refreshToken){
public static MemberTokenResponseDto of(String accessToken,
String refreshToken) {
return MemberTokenResponseDto.builder()
.memberId(memberId)
.accessToken(accessToken)
.refreshToken(refreshToken)
.build();
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/org/sopt/sweet/domain/member/entity/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@Builder(access = AccessLevel.PRIVATE)
@Table(name = "member")
@Entity
public class Member extends BaseTimeEntity {
Expand All @@ -20,7 +18,7 @@ public class Member extends BaseTimeEntity {
private Long id;

@Column(nullable = false)
private String socialId;
private Long socialId;

@Enumerated(EnumType.STRING)
@Column(nullable = false)
Expand All @@ -30,4 +28,11 @@ public class Member extends BaseTimeEntity {

private String nickName;

@Builder
public Member(Long socialId, String nickName, SocialType socialType, String profileImg) {
this.socialId = socialId;
this.nickName = nickName;
this.socialType = socialType;
this.profileImg = profileImg;
}
}
24 changes: 24 additions & 0 deletions src/main/java/org/sopt/sweet/domain/member/entity/OAuthToken.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.sopt.sweet.domain.member.entity;


import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.Getter;

@Getter
@Data
public class OAuthToken {
@JsonProperty("access_token")
private String accessToken;

@JsonProperty("token_type")
private String tokenType;

@JsonProperty("refresh_token")
private String refreshToken;

@JsonProperty("expires_in")
private int expiresIn;

private String scope;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
import org.springframework.data.jpa.repository.JpaRepository;

public interface MemberRepository extends JpaRepository<Member, Long> {
Member findBySocialId(Long socialId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.RequiredArgsConstructor;
import org.sopt.sweet.domain.member.dto.response.MemberTokenResponseDto;
import org.sopt.sweet.domain.member.repository.MemberRepository;
import org.sopt.sweet.global.config.auth.jwt.JwtProvider;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -12,11 +13,12 @@
public class MemberService {

private final JwtProvider jwtProvider;
private final MemberRepository memberRepository;

public MemberTokenResponseDto getToken(Long memberId){
public MemberTokenResponseDto getToken(Long memberId) {
String accessToken = issueNewAccessToken(memberId);
String refreshToken = issueNewRefreshToken(memberId);
return new MemberTokenResponseDto(memberId, accessToken, refreshToken);
return new MemberTokenResponseDto(accessToken, refreshToken);
}

private String issueNewAccessToken(Long memberId) {
Expand All @@ -26,4 +28,6 @@ private String issueNewAccessToken(Long memberId) {
private String issueNewRefreshToken(Long memberId) {
return jwtProvider.getIssueToken(memberId, false);
}
}


}
Loading