From a7c8c2c759cd176f30e098cf105f8b5b4519c85d Mon Sep 17 00:00:00 2001 From: unanchoi Date: Tue, 16 Jan 2024 23:34:19 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=20=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http/application/get-application-page1.http | 2 +- http/application/get-applications.http | 2 ++ .../config/jwt/JwtTokenProvider.java | 14 +------------- .../startlionserver/service/AuthService.java | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) create mode 100644 http/application/get-applications.http diff --git a/http/application/get-application-page1.http b/http/application/get-application-page1.http index bf9933d..422c3ce 100644 --- a/http/application/get-application-page1.http +++ b/http/application/get-application-page1.http @@ -1,3 +1,3 @@ // get from http-client.private.env.json GET {{host}}/api/application/1/page1 -Authorization: Bearer {{token}} \ No newline at end of file +Authorization: Bearer {{new-token}} \ No newline at end of file diff --git a/http/application/get-applications.http b/http/application/get-applications.http new file mode 100644 index 0000000..ea7437c --- /dev/null +++ b/http/application/get-applications.http @@ -0,0 +1,2 @@ +GET {{host}}/api/application +Authorization: Bearer {{token}} \ No newline at end of file diff --git a/src/main/java/com/startlion/startlionserver/config/jwt/JwtTokenProvider.java b/src/main/java/com/startlion/startlionserver/config/jwt/JwtTokenProvider.java index 059ef49..9688e42 100644 --- a/src/main/java/com/startlion/startlionserver/config/jwt/JwtTokenProvider.java +++ b/src/main/java/com/startlion/startlionserver/config/jwt/JwtTokenProvider.java @@ -1,6 +1,5 @@ package com.startlion.startlionserver.config.jwt; -import com.startlion.startlionserver.domain.entity.User; import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; import jakarta.annotation.PostConstruct; @@ -31,22 +30,11 @@ protected void init() { public String generateToken(Authentication authentication, Long tokenExpirationTime) { final Date now = new Date(); - User user = (User) authentication.getPrincipal(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); // refreshToken을 제외한 필드만 가진 객체 생성 Map claims = new HashMap<>(); - claims.put("id", user.getUserId()); - claims.put("createdAt", user.getCreatedAt().format(formatter)); - claims.put("updatedAt", user.getUpdatedAt().format(formatter)); - claims.put("userId", user.getUserId()); - claims.put("email", user.getEmail()); - claims.put("username", user.getUsername()); - claims.put("socialId", user.getSocialId()); - claims.put("imageUrl", user.getImageUrl()); - claims.put("expiredIn", user.getExpiredIn()); - + claims.put("id", authentication.getPrincipal()); return Jwts.builder() diff --git a/src/main/java/com/startlion/startlionserver/service/AuthService.java b/src/main/java/com/startlion/startlionserver/service/AuthService.java index d7f2242..b6758f8 100644 --- a/src/main/java/com/startlion/startlionserver/service/AuthService.java +++ b/src/main/java/com/startlion/startlionserver/service/AuthService.java @@ -66,7 +66,7 @@ public OAuthResponse authenticateUser(String authCode) throws Exception { jsonNode.get("picture").asText()); User user = userRepository.findByEmail(email).orElseGet(() -> userRepository.save(newUser)); - val authentication = new UsernamePasswordAuthenticationToken(user, null, null); + val authentication = new UsernamePasswordAuthenticationToken(user.getUserId(), null, null); val tokenVO = generateToken(authentication); user.updateRefreshToken(tokenVO.refreshToken()); return OAuthResponse.of(tokenVO.accessToken(), tokenVO.refreshToken());