fix build with new jsonwebtoken api
	
		
			
	
		
	
	
		
	
		
			Some checks reported errors
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build was killed
				
			
		
		
	
	
				
					
				
			
		
			Some checks reported errors
		
		
	
	continuous-integration/drone/push Build was killed
				
			This commit is contained in:
		
							
								
								
									
										4
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								pom.xml
									
									
									
									
									
								
							| @@ -52,12 +52,12 @@ | ||||
|         <dependency> | ||||
|             <groupId>io.jsonwebtoken</groupId> | ||||
|             <artifactId>jjwt-impl</artifactId> | ||||
|             <version>0.11.5</version> | ||||
|             <version>0.12.6</version> | ||||
|         </dependency> | ||||
|         <dependency> | ||||
|             <groupId>io.jsonwebtoken</groupId> | ||||
|             <artifactId>jjwt-jackson</artifactId> | ||||
|             <version>0.11.5</version> | ||||
|             <version>0.12.6</version> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- Database Dependencies --> | ||||
|   | ||||
| @@ -2,14 +2,13 @@ package wtf.beatrice.releasehive.services; | ||||
|  | ||||
| import io.jsonwebtoken.Claims; | ||||
| import io.jsonwebtoken.Jwts; | ||||
| import io.jsonwebtoken.SignatureAlgorithm; | ||||
| import io.jsonwebtoken.io.Decoders; | ||||
| import io.jsonwebtoken.security.Keys; | ||||
| import org.springframework.beans.factory.annotation.Value; | ||||
| import org.springframework.stereotype.Service; | ||||
| import wtf.beatrice.releasehive.models.User; | ||||
|  | ||||
| import java.security.Key; | ||||
| import javax.crypto.SecretKey; | ||||
| import java.util.Date; | ||||
| import java.util.HashMap; | ||||
| import java.util.Map; | ||||
| @@ -52,11 +51,11 @@ public class JWTService | ||||
|     ) { | ||||
|         return Jwts | ||||
|                 .builder() | ||||
|                 .setClaims(extraClaims) | ||||
|                 .setSubject(userDetails.getEmail()) | ||||
|                 .setIssuedAt(new Date(System.currentTimeMillis())) | ||||
|                 .setExpiration(new Date(System.currentTimeMillis() + expiration)) | ||||
|                 .signWith(getSignInKey(), SignatureAlgorithm.HS256) | ||||
|                 .claims(extraClaims) | ||||
|                 .subject(userDetails.getEmail()) | ||||
|                 .issuedAt(new Date(System.currentTimeMillis())) | ||||
|                 .expiration(new Date(System.currentTimeMillis() + expiration)) | ||||
|                 .signWith(getSignInKey(), Jwts.SIG.HS256) | ||||
|                 .compact(); | ||||
|     } | ||||
|  | ||||
| @@ -75,14 +74,14 @@ public class JWTService | ||||
|  | ||||
|     private Claims extractAllClaims(String token) { | ||||
|         return Jwts | ||||
|                 .parserBuilder() | ||||
|                 .setSigningKey(getSignInKey()) | ||||
|                 .parser() | ||||
|                 .verifyWith(getSignInKey()) | ||||
|                 .build() | ||||
|                 .parseClaimsJws(token) | ||||
|                 .getBody(); | ||||
|                 .parseSignedClaims(token) | ||||
|                 .getPayload(); | ||||
|     } | ||||
|  | ||||
|     private Key getSignInKey() { | ||||
|     private SecretKey getSignInKey() { | ||||
|         byte[] keyBytes = Decoders.BASE64.decode(secretKey); | ||||
|         return Keys.hmacShaKeyFor(keyBytes); | ||||
|     } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user