Skip to content

Commit 071660c

Browse files
Doha2012Doha2012
committed
cleanup and upgrade
1 parent 718c8c3 commit 071660c

File tree

5 files changed

+26
-42
lines changed

5 files changed

+26
-42
lines changed

‎oauth-authorization-server/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfigJwt.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.context.annotation.Configuration;
99
import org.springframework.context.annotation.Primary;
10-
import org.springframework.core.io.ClassPathResource;
1110
import org.springframework.security.authentication.AuthenticationManager;
1211
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
1312
import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
@@ -21,7 +20,6 @@
2120
import org.springframework.security.oauth2.provider.token.TokenStore;
2221
import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
2322
import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
24-
import org.springframework.security.oauth2.provider.token.store.KeyStoreKeyFactory;
2523

2624
@Configuration
2725
@EnableAuthorizationServer
@@ -102,9 +100,9 @@ public TokenStore tokenStore() {
102100
@Bean
103101
public JwtAccessTokenConverter accessTokenConverter() {
104102
final JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
105-
// converter.setSigningKey("123");
106-
final KeyStoreKeyFactory keyStoreKeyFactory = new KeyStoreKeyFactory(new ClassPathResource("mytest.jks"), "mypass".toCharArray());
107-
converter.setKeyPair(keyStoreKeyFactory.getKeyPair("mytest"));
103+
converter.setSigningKey("123");
104+
// final KeyStoreKeyFactory keyStoreKeyFactory = new KeyStoreKeyFactory(new ClassPathResource("mytest.jks"), "mypass".toCharArray());
105+
// converter.setKeyPair(keyStoreKeyFactory.getKeyPair("mytest"));
108106
return converter;
109107
}
110108

‎oauth-resource-server-1/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigJwt.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package org.baeldung.config;
22

3-
import java.io.IOException;
4-
5-
import org.apache.commons.io.IOUtils;
63
import org.springframework.beans.factory.annotation.Autowired;
74
import org.springframework.context.annotation.Bean;
85
import org.springframework.context.annotation.Configuration;
96
import org.springframework.context.annotation.Primary;
10-
import org.springframework.core.io.ClassPathResource;
11-
import org.springframework.core.io.Resource;
127
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
138
import org.springframework.security.config.http.SessionCreationPolicy;
149
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
@@ -50,15 +45,15 @@ public JwtAccessTokenConverter accessTokenConverter() {
5045
final JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
5146
converter.setAccessTokenConverter(customAccessTokenConverter);
5247

53-
// converter.setSigningKey("123");
54-
final Resource resource = new ClassPathResource("public.txt");
55-
String publicKey = null;
56-
try {
57-
publicKey = IOUtils.toString(resource.getInputStream());
58-
} catch (final IOException e) {
59-
throw new RuntimeException(e);
60-
}
61-
converter.setVerifierKey(publicKey);
48+
converter.setSigningKey("123");
49+
// final Resource resource = new ClassPathResource("public.txt");
50+
// String publicKey = null;
51+
// try {
52+
// publicKey = IOUtils.toString(resource.getInputStream());
53+
// } catch (final IOException e) {
54+
// throw new RuntimeException(e);
55+
// }
56+
// converter.setVerifierKey(publicKey);
6257
return converter;
6358
}
6459

‎oauth-resource-server-2/pom.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
<packaging>war</packaging>
77

88
<parent>
9-
<groupId>org.springframework.boot</groupId>
10-
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>2.0.0.M7</version>
12-
<relativePath />
9+
<groupId>org.baeldung</groupId>
10+
<artifactId>spring-security-oauth</artifactId>
11+
<version>1.0.0-SNAPSHOT</version>
1312
</parent>
1413

1514
<properties>
1615
<swagger.version>2.8.0</swagger.version>
17-
<oauth.version>2.2.1.RELEASE</oauth.version>
18-
<jwt.version>1.0.9.RELEASE</jwt.version>
19-
<commons-io.version>2.6</commons-io.version>
2016
</properties>
2117

2218
<dependencies>

‎oauth-resource-server-2/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package org.baeldung.config;
22

3-
import java.io.IOException;
43
import java.net.MalformedURLException;
54
import java.net.URL;
6-
import java.nio.charset.Charset;
75
import java.util.Arrays;
86

9-
import org.apache.commons.io.IOUtils;
107
import org.springframework.context.annotation.Bean;
118
import org.springframework.context.annotation.Configuration;
129
import org.springframework.context.annotation.Primary;
13-
import org.springframework.core.io.ClassPathResource;
14-
import org.springframework.core.io.Resource;
1510
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
1611
import org.springframework.security.config.http.SessionCreationPolicy;
1712
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
@@ -35,8 +30,8 @@ public void configure(final HttpSecurity http) throws Exception {
3530
.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
3631
.and()
3732
.authorizeRequests()
38-
// .antMatchers("/swagger*", "/v2/**")
39-
// .access("#oauth2.hasScope('read')")
33+
.antMatchers("/swagger*", "/v2/**")
34+
.access("#oauth2.hasScope('read')")
4035
.anyRequest()
4136
.permitAll();
4237

@@ -60,14 +55,14 @@ public JwtAccessTokenConverter accessTokenConverter() {
6055
converter.setSigningKey("123");
6156
converter.setJwtClaimsSetVerifier(jwtClaimsSetVerifier());
6257

63-
final Resource resource = new ClassPathResource("public.txt");
64-
String publicKey = null;
65-
try {
66-
publicKey = IOUtils.toString(resource.getInputStream(), Charset.defaultCharset());
67-
} catch (final IOException e) {
68-
throw new RuntimeException(e);
69-
}
70-
converter.setVerifierKey(publicKey);
58+
// final Resource resource = new ClassPathResource("public.txt");
59+
// String publicKey = null;
60+
// try {
61+
// publicKey = IOUtils.toString(resource.getInputStream(), Charset.defaultCharset());
62+
// } catch (final IOException e) {
63+
// throw new RuntimeException(e);
64+
// }
65+
// converter.setVerifierKey(publicKey);
7166
return converter;
7267
}
7368

‎oauth-resource-server-2/src/test/java/org/baeldung/test/OAuth2SwaggerIntegrationTest.java renamed to ‎oauth-resource-server-2/src/test/java/org/baeldung/test/OAuth2SwaggerLiveTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
@RunWith(SpringRunner.class)
2020
@SpringBootTest(classes = ResourceServerApplication.class, webEnvironment = WebEnvironment.DEFINED_PORT)
21-
public class OAuth2SwaggerIntegrationTest {
21+
public class OAuth2SwaggerLiveTest {
2222

2323
private static final String URL_PREFIX = "http://localhost:8082/spring-security-oauth-resource";
2424
private String tokenValue = null;

0 commit comments

Comments
 (0)