Commit 62d44ec3 authored by Jasha Joachimsthal's avatar Jasha Joachimsthal Committed by 陈健

OAUTH-3278 Update dependencies and Spring configuration

parent a1bf917f
......@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.4.RELEASE</version>
<version>2.1.5.RELEASE</version>
</parent>
<dependencies>
......@@ -32,31 +32,29 @@
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>2.3.4.RELEASE</version>
<version>2.3.5.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-jwt</artifactId>
<version>1.0.9.RELEASE</version>
<version>1.0.10.RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
<version>5.63</version>
<version>6.13</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
</dependency>
<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
</dependency>
<dependency>
<groupId>nz.net.ultraq.thymeleaf</groupId>
......@@ -65,7 +63,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<version>27.1-jre</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......@@ -103,4 +101,4 @@
</plugins>
</build>
</project>
\ No newline at end of file
</project>
......@@ -3,14 +3,14 @@ package com.onegini.oidc.config;
import javax.validation.constraints.NotBlank;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import lombok.Getter;
import lombok.Setter;
@Validated
@Configuration
@Component
@ConfigurationProperties(prefix = "onegini.oidc")
@Getter
@Setter
......@@ -22,4 +22,4 @@ public class ApplicationProperties {
@NotBlank
private String issuer;
private boolean idTokenEncryptionEnabled;
}
\ No newline at end of file
}
......@@ -18,7 +18,6 @@ import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
import org.springframework.stereotype.Component;
import com.nimbusds.jwt.EncryptedJWT;
import com.nimbusds.jwt.JWT;
......@@ -31,11 +30,9 @@ import com.onegini.oidc.model.TokenDetails;
import com.onegini.oidc.model.UserInfo;
import lombok.extern.slf4j.Slf4j;
@Component
@Slf4j
public class OpenIdConnectAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
@Resource
private OAuth2RestOperations oAuth2RestOperations;
@Resource
......@@ -137,4 +134,4 @@ public class OpenIdConnectAuthenticationFilter extends AbstractAuthenticationPro
}
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment