Skip to content

Commit ff0910f

Browse files
authored
feat: 자동 로그인 해제, 재로그인 시에는 새로 인증 (#66)
1 parent a1f62f2 commit ff0910f

File tree

6 files changed

+10
-54
lines changed

6 files changed

+10
-54
lines changed

backend/src/main/java/com/back/domain/member/controller/ApiV1MemberController.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,9 @@ public ResponseEntity<ApiResponse<LoginResDto>> login(
6565
@DeleteMapping("/logout")
6666
@Operation(summary = "로그아웃", description = "로그아웃")
6767
public ResponseEntity<ApiResponse<Void>> logout() {
68-
Member actor = rq.getActorFromDb();
69-
7068
rq.deleteCookie("apiKey");
7169
rq.deleteCookie("accessToken");
72-
if(actor.getSocialAccessToken() != null) {
73-
memberService.social_logout(actor);
74-
}
70+
rq.deleteCookie("JSESSIONID");
7571

7672
return ResponseEntity
7773
.status(HttpStatus.OK)

backend/src/main/java/com/back/domain/member/entity/Member.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public class Member extends BaseEntity {
4646
// *** 개발자용 정보 ***
4747
private MemberRole role = MemberRole.USER;
4848
private String apiKey = null;
49-
private String socialAccessToken = null;
5049

5150
//생성자(회원 가입)
5251
public Member(String email, String password, String name) {

backend/src/main/java/com/back/domain/member/service/AuthService.java

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
import org.springframework.beans.factory.annotation.Value;
66
import org.springframework.stereotype.Service;
77

8-
import java.net.URI;
9-
import java.net.http.HttpClient;
10-
import java.net.http.HttpRequest;
11-
import java.net.http.HttpResponse;
128
import java.util.Map;
139

1410
@Service
@@ -19,36 +15,6 @@ public class AuthService {
1915
@Value("${custom.accessToken.expirationSeconds}")
2016
private int accessTokenExpirationSeconds;
2117

22-
private final String kakaoURL = "https://kapi.kakao.com/v1/user/logout";
23-
24-
void social_logout(String provider, String accessToken){
25-
HttpClient client= HttpClient.newHttpClient();
26-
try {
27-
switch (provider) {
28-
case "KAKAO" -> {
29-
HttpRequest request = HttpRequest.newBuilder()
30-
.uri(URI.create(kakaoURL))
31-
.header("Authorization", "Bearer " + accessToken)
32-
.POST(HttpRequest.BodyPublishers.noBody())
33-
.build();
34-
35-
HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
36-
37-
System.out.println("responseCode : " + response.statusCode());
38-
System.out.println("responseBody : " + response.body());
39-
}
40-
case "GOOGLE" -> {
41-
42-
}
43-
case "NAVER" -> {
44-
45-
}
46-
}
47-
} catch (Exception e) {
48-
49-
}
50-
}
51-
5218
String genAccessToken(Member member) {
5319
long id = member.getId();
5420
String email = member.getEmail();

backend/src/main/java/com/back/domain/member/service/MemberService.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,17 @@ public Member login(String email, String password) {
5252
}
5353

5454
//로그인 (소셜 계정)
55-
public Member social_login(String email, String name, String socialAccessToken) {
55+
public Member social_login(String email, String name) {
5656
Member member = findByEmail(email).orElse(null);
5757

5858
//최초 로그인일 경우 가입 처리
5959
if(member == null) {
6060
member = signup(email, "", name);
6161
}
6262

63-
member.setSocialAccessToken(socialAccessToken);
64-
6563
return member;
6664
}
6765

68-
//로그아웃 (소셜 계정)
69-
public void social_logout(Member member) {
70-
String provider = member.getEmail().substring(1, member.getEmail().indexOf("]"));
71-
72-
//authService.social_logout(provider, member.getSocialAccessToken());
73-
member.setSocialAccessToken(null);
74-
}
75-
7666
//식별코드 생성
7767
public void genCode(Member member) {
7868
final String CHAR_POOL = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

backend/src/main/java/com/back/global/security/CustomOAuth2UserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
5353
}
5454
}
5555

56-
Member member = memberService.social_login(email, name, socialAccessToken);
56+
Member member = memberService.social_login(email, name);
5757

5858
return new SecurityUser(
5959
member.getId(),

backend/src/main/resources/application.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,17 @@ spring:
5858
redirect-uri: '{baseUrl}/{action}/oauth2/code/{registrationId}'
5959
provider:
6060
kakao:
61-
authorization-uri: https://kauth.kakao.com/oauth/authorize
61+
authorization-uri: https://kauth.kakao.com/oauth/authorize?prompt=login
6262
token-uri: https://kauth.kakao.com/oauth/token
6363
user-info-uri: https://kapi.kakao.com/v2/user/me
6464
user-name-attribute: id
65+
google:
66+
authorization-uri: https://accounts.google.com/o/oauth2/v2/auth?prompt=select_account
67+
token-uri: https://www.googleapis.com/oauth2/v4/token
68+
user-info-uri: https://www.googleapis.com/oauth2/v3/userinfo
69+
user-name-attribute: sub
6570
naver:
66-
authorization-uri: https://nid.naver.com/oauth2.0/authorize
71+
authorization-uri: https://nid.naver.com/oauth2.0/authorize?auth_type=reauthenticate
6772
token-uri: https://nid.naver.com/oauth2.0/token
6873
user-info-uri: https://openapi.naver.com/v1/nid/me
6974
user-name-attribute: response

0 commit comments

Comments
 (0)