Skip to content

Commit da3e136

Browse files
authored
Merge pull request #24 from ReLive27/main
fix(config): ensure SimpleAuth0Properties is loaded before OpaqueToke…
2 parents c5c6829 + 0bbf9f7 commit da3e136

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

core/src/main/java/io/github/simpleauth0/core/configuration/AuthTokenConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static class OpaqueTokenConfigurer {
1616
}
1717

1818
@Configuration(proxyBeanMethods = false)
19-
@Import(JwtConfiguredCondition.class)
19+
@Import(JwtConfiguration.class)
2020
static class JwtConfigurer {
2121

2222
}

core/src/main/java/io/github/simpleauth0/core/configuration/JwtConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.github.simpleauth0.core.token.JwtTokenGenerator;
2121
import io.github.simpleauth0.core.token.TokenGenerator;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
23+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2324
import org.springframework.context.annotation.Bean;
2425
import org.springframework.context.annotation.Conditional;
2526
import org.springframework.context.annotation.Configuration;
@@ -28,7 +29,6 @@
2829
import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
2930
import org.springframework.security.oauth2.jwt.NimbusJwtEncoder;
3031

31-
import javax.crypto.KeyGenerator;
3232
import javax.crypto.SecretKey;
3333
import javax.crypto.spec.SecretKeySpec;
3434
import java.nio.charset.StandardCharsets;
@@ -42,6 +42,7 @@
4242
*/
4343
@Conditional(JwtConfiguredCondition.class)
4444
@Configuration(proxyBeanMethods = false)
45+
@EnableConfigurationProperties(SimpleAuth0Properties.class)
4546
public class JwtConfiguration {
4647

4748
@Configuration(proxyBeanMethods = false)

core/src/main/java/io/github/simpleauth0/core/configuration/OpaqueTokenConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.github.simpleauth0.core.token.OpaqueToken;
55
import io.github.simpleauth0.core.token.OpaqueTokenGenerator;
66
import io.github.simpleauth0.core.token.TokenGenerator;
7+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
78
import org.springframework.context.annotation.Bean;
89
import org.springframework.context.annotation.Conditional;
910
import org.springframework.context.annotation.Configuration;
@@ -14,6 +15,7 @@
1415
*/
1516
@Conditional({OpaqueConfiguredCondition.class})
1617
@Configuration(proxyBeanMethods = false)
18+
@EnableConfigurationProperties(SimpleAuth0Properties.class)
1719
public class OpaqueTokenConfiguration {
1820

1921
@Bean

0 commit comments

Comments
 (0)