Removed Joda Time dependency
This commit is contained in:
parent
8794364850
commit
fb15315944
4
pom.xml
4
pom.xml
@ -44,10 +44,6 @@
|
|||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<version>3.3.2</version>
|
<version>3.3.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>joda-time</groupId>
|
|
||||||
<artifactId>joda-time</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||||
|
|||||||
@ -1,11 +1,13 @@
|
|||||||
package com.svlada.security.model.token;
|
package com.svlada.security.model.token;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.ZoneId;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.joda.time.DateTime;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@ -50,13 +52,15 @@ public class JwtTokenFactory {
|
|||||||
Claims claims = Jwts.claims().setSubject(userContext.getUsername());
|
Claims claims = Jwts.claims().setSubject(userContext.getUsername());
|
||||||
claims.put("scopes", userContext.getAuthorities().stream().map(s -> s.toString()).collect(Collectors.toList()));
|
claims.put("scopes", userContext.getAuthorities().stream().map(s -> s.toString()).collect(Collectors.toList()));
|
||||||
|
|
||||||
DateTime currentTime = new DateTime();
|
LocalDateTime currentTime = LocalDateTime.now();
|
||||||
|
|
||||||
String token = Jwts.builder()
|
String token = Jwts.builder()
|
||||||
.setClaims(claims)
|
.setClaims(claims)
|
||||||
.setIssuer(settings.getTokenIssuer())
|
.setIssuer(settings.getTokenIssuer())
|
||||||
.setIssuedAt(currentTime.toDate())
|
.setIssuedAt(Date.from(currentTime.atZone(ZoneId.systemDefault()).toInstant()))
|
||||||
.setExpiration(currentTime.plusMinutes(settings.getTokenExpirationTime()).toDate())
|
.setExpiration(Date.from(currentTime
|
||||||
|
.plusMinutes(settings.getTokenExpirationTime())
|
||||||
|
.atZone(ZoneId.systemDefault()).toInstant()))
|
||||||
.signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
|
.signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
|
||||||
.compact();
|
.compact();
|
||||||
|
|
||||||
@ -68,7 +72,7 @@ public class JwtTokenFactory {
|
|||||||
throw new IllegalArgumentException("Cannot create JWT Token without username");
|
throw new IllegalArgumentException("Cannot create JWT Token without username");
|
||||||
}
|
}
|
||||||
|
|
||||||
DateTime currentTime = new DateTime();
|
LocalDateTime currentTime = LocalDateTime.now();
|
||||||
|
|
||||||
Claims claims = Jwts.claims().setSubject(userContext.getUsername());
|
Claims claims = Jwts.claims().setSubject(userContext.getUsername());
|
||||||
claims.put("scopes", Arrays.asList(Scopes.REFRESH_TOKEN.authority()));
|
claims.put("scopes", Arrays.asList(Scopes.REFRESH_TOKEN.authority()));
|
||||||
@ -77,8 +81,10 @@ public class JwtTokenFactory {
|
|||||||
.setClaims(claims)
|
.setClaims(claims)
|
||||||
.setIssuer(settings.getTokenIssuer())
|
.setIssuer(settings.getTokenIssuer())
|
||||||
.setId(UUID.randomUUID().toString())
|
.setId(UUID.randomUUID().toString())
|
||||||
.setIssuedAt(currentTime.toDate())
|
.setIssuedAt(Date.from(currentTime.atZone(ZoneId.systemDefault()).toInstant()))
|
||||||
.setExpiration(currentTime.plusMinutes(settings.getRefreshTokenExpTime()).toDate())
|
.setExpiration(Date.from(currentTime
|
||||||
|
.plusMinutes(settings.getRefreshTokenExpTime())
|
||||||
|
.atZone(ZoneId.systemDefault()).toInstant()))
|
||||||
.signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
|
.signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
|
||||||
.compact();
|
.compact();
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<include resource="org/springframework/boot/logging/logback/base.xml"/>
|
<include resource="org/springframework/boot/logging/logback/base.xml"/>
|
||||||
<logger name="org.springframework.web" level="INFO"/>
|
<logger name="org.springframework.web" level="DEBUG"/>
|
||||||
|
<logger name="org.springframework.security" level="DEBUG"/>
|
||||||
<logger name="org.springframework" level="ERROR"/>
|
<logger name="org.springframework" level="ERROR"/>
|
||||||
<logger name="com.svlada" level="ALL"/>
|
<logger name="com.svlada" level="ALL"/>
|
||||||
</configuration>
|
</configuration>
|
||||||
Loading…
Reference in New Issue
Block a user