updated code mohd arham

This commit is contained in:
Mohd-Arham
2025-11-27 14:41:07 +05:30
parent 72332d6f99
commit b33d658834
10 changed files with 108 additions and 103 deletions
@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Service;
import com.billpaymentservice.bbps.util.BBPSConstant;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
@@ -22,22 +24,23 @@ public class JwtUtil {
@Value("${jwt.secret}")
private String secret;
private final Map<String, Date> tokenBlacklist = new HashMap<>();
private Key getSigningKey() {
byte[] keyBytes = Decoders.BASE64.decode(secret);
return Keys.hmacShaKeyFor(keyBytes);
}
// Access Token - 2 Hours
private final long jwtExpirationInMs = 1000 * 60 * 60 * 2; // 2 hours
// Refresh Token - 7 Days
private final long refreshExpirationDateInMs = 1000L * 60 * 60 * 24 * 7; // 7 days
private final Map<String, Date> tokenBlacklist = new HashMap<>();
public String generateToken(String username, String mid) {
Map<String, Object> claims = new HashMap<>();
claims.put("mid", mid);
claims.put("expiryTime", new Date(System.currentTimeMillis() + BBPSConstant.JWT_EXPIRATION_MS).toString());
return createToken(claims, username.toUpperCase());
}
public String doGenerateRefreshToken(Map<String, Object> claims, String subject) {
return Jwts.builder().setClaims(claims).setSubject(subject).setIssuedAt(new Date(System.currentTimeMillis()))
.setExpiration(new Date(System.currentTimeMillis() + refreshExpirationDateInMs))
.setExpiration(new Date(System.currentTimeMillis() + BBPSConstant.REFRESH_EXPIRATION_MS))
.signWith(getSigningKey(), SignatureAlgorithm.HS512).compact();
}
@@ -62,28 +65,28 @@ public class JwtUtil {
return extractExpiration(token).before(new Date());
}
public String generateToken(String username, String mid) {
Map<String, Object> claims = new HashMap<>();
claims.put("mid", mid);
claims.put("expiryTime", new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 10).toString());
return createToken(claims, username.toUpperCase());
private String createToken(Map<String, Object> claims, String subject) {
return Jwts.builder().setClaims(claims).setSubject(subject).setIssuedAt(new Date(System.currentTimeMillis()))
.setExpiration(new Date(System.currentTimeMillis() + BBPSConstant.JWT_EXPIRATION_MS))
.signWith(getSigningKey(), SignatureAlgorithm.HS512).compact();
}
private String createToken(Map<String, Object> claims, String subject) {
private String createToken1(Map<String, Object> claims,String subject) {
return Jwts.builder().setClaims(claims).setSubject(subject).setIssuedAt(new Date(System.currentTimeMillis()))
.setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 10))
.signWith(getSigningKey(), SignatureAlgorithm.HS512).compact();
}
private String createToken1(String subject) {
return Jwts.builder().setSubject(subject).setIssuedAt(new Date(System.currentTimeMillis()))
.setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 10))
.signWith(getSigningKey(), SignatureAlgorithm.HS512).compact();
}
// public Boolean validateToken(String token, UserDetails userDetails) {
// final String username = extractUsername(token);
// return true;
// }
public Boolean validateToken(String token, UserDetails userDetails) {
final String username = extractUsername(token);
return true;
final String mobileNo = extractUsername(token);
// System.out.println("Extracted mobileNo from token: " + mobileNo );
// System.out.println("Username from UserDetails: " + userDetails.getUsername());
return (mobileNo .equals(userDetails.getUsername()) && !isTokenExpired(token));
}
public void invalidateToken(String token) {
@@ -96,7 +99,9 @@ public class JwtUtil {
}
public String generateToken(String mobileNo) {
return createToken1(mobileNo);
Map<String, Object> claims = new HashMap<>();
claims.put("mobileNo", mobileNo);
return createToken1(claims,mobileNo);
}
}