Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.ilchinjo.mainproject.global.security.jwt.JwtTokenizer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;

import java.util.Date;
Expand Down Expand Up @@ -39,8 +38,8 @@ public String refreshToken(String refreshToken) {

log.info("Reissue Access Token");

Authentication authentication = jwtTokenizer.getAuthentication(refreshToken);
Member member = memberService.findVerifiedMember(authentication.getName());
String memberEmail = jwtTokenizer.parseEmailFromPayload(refreshToken);
Member member = memberService.findVerifiedMember(memberEmail);

Map<String, Object> claims = new HashMap<>();
claims.put("memberId", member.getMemberId());
Expand All @@ -57,8 +56,8 @@ public String refreshToken(String refreshToken) {
@Override
public void deleteToken(String refreshToken) {

Authentication authentication = jwtTokenizer.getAuthentication(refreshToken);
Member member = memberService.findVerifiedMember(authentication.getName());
String memberEmail = jwtTokenizer.parseEmailFromPayload(refreshToken);
Member member = memberService.findVerifiedMember(memberEmail);

RefreshToken findRefreshToken = findVerifiedRefreshToken(member.getEmail());

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.ilchinjo.mainproject.global.security.jwt;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ilchinjo.mainproject.global.security.userdetails.MemberDetailsService;
import io.jsonwebtoken.*;
import io.jsonwebtoken.io.Decoders;
Expand All @@ -9,16 +11,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;

import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.*;

@Slf4j
@Component
Expand Down Expand Up @@ -113,6 +110,23 @@ public Long parseMemberId(String jwt) {
return claims.get("memberId", Long.class);
}

public String parseEmailFromPayload(String jwt) {

HashMap<String, String> payloadMap;

try {
String[] splitJwt = jwt.split("\\.");
String payload = new String(Base64.getDecoder().decode(splitJwt[1].getBytes()));

payloadMap = new ObjectMapper().readValue(payload, HashMap.class);
} catch (JsonProcessingException e) {
log.error(e.getMessage());
return null;
}

return String.valueOf(payloadMap.get("sub"));
}

public JwtStatus validateToken(String token) {

String base64EncodedSecretKey = encodeBase64SecretKey(secretKey);
Expand All @@ -129,20 +143,4 @@ public JwtStatus validateToken(String token) {

return JwtStatus.DENIED;
}

public Authentication getAuthentication(String token) {

String base64EncodedSecretKey = encodeBase64SecretKey(secretKey);
Key key = getKeyFromBase64EncodedKey(base64EncodedSecretKey);

Claims claims = Jwts.parserBuilder()
.setSigningKey(key)
.build()
.parseClaimsJws(token)
.getBody();

UserDetails userDetails = memberDetailsService.loadUserByUsername(claims.getSubject());

return new UsernamePasswordAuthenticationToken(userDetails, token, userDetails.getAuthorities());
}
}