Merge branch '6.5.x' into 7.0.x
This commit is contained in:
@@ -376,7 +376,9 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
public ReactiveJwtDecoder jwtDecoder() {
|
public ReactiveJwtDecoder jwtDecoder() {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(issuer).build();
|
NimbusReactiveJwtDecoder jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(issuer).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -386,7 +388,9 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): ReactiveJwtDecoder {
|
fun jwtDecoder(): ReactiveJwtDecoder {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(issuer).build()
|
val jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(issuer).build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
@@ -452,8 +456,10 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
ReactiveJwtDecoder jwtDecoder() {
|
ReactiveJwtDecoder jwtDecoder() {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
NimbusReactiveJwtDecoder jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).build();
|
.jwsAlgorithm(RS512).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -463,8 +469,10 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): ReactiveJwtDecoder {
|
fun jwtDecoder(): ReactiveJwtDecoder {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
val jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).build()
|
.jwsAlgorithm(RS512).build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
@@ -479,8 +487,10 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
ReactiveJwtDecoder jwtDecoder() {
|
ReactiveJwtDecoder jwtDecoder() {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
NimbusReactiveJwtDecoder jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build();
|
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -490,8 +500,10 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): ReactiveJwtDecoder {
|
fun jwtDecoder(): ReactiveJwtDecoder {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
val jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build()
|
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
@@ -506,11 +518,13 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
ReactiveJwtDecoder jwtDecoder() {
|
ReactiveJwtDecoder jwtDecoder() {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(this.jwkSetUri)
|
NimbusReactiveJwtDecoder jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithms(algorithms -> {
|
.jwsAlgorithms(algorithms -> {
|
||||||
algorithms.add(RS512);
|
algorithms.add(RS512);
|
||||||
algorithms.add(ES512);
|
algorithms.add(ES512);
|
||||||
}).build();
|
}).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -520,12 +534,14 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): ReactiveJwtDecoder {
|
fun jwtDecoder(): ReactiveJwtDecoder {
|
||||||
return NimbusReactiveJwtDecoder.withIssuerLocation(this.jwkSetUri)
|
val jwtDecoder = NimbusReactiveJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithms {
|
.jwsAlgorithms {
|
||||||
it.add(RS512)
|
it.add(RS512)
|
||||||
it.add(ES512)
|
it.add(ES512)
|
||||||
}
|
}
|
||||||
.build()
|
.build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
|
|||||||
@@ -519,7 +519,9 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
public JwtDecoder jwtDecoder() {
|
public JwtDecoder jwtDecoder() {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(issuer).build();
|
NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withIssuerLocation(issuer).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -529,7 +531,9 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): JwtDecoder {
|
fun jwtDecoder(): JwtDecoder {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(issuer).build()
|
val jwtDecoder = NimbusJwtDecoder.withIssuerLocation(issuer).build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
@@ -595,8 +599,10 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
JwtDecoder jwtDecoder() {
|
JwtDecoder jwtDecoder() {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).build();
|
.jwsAlgorithm(RS512).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -606,8 +612,10 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): JwtDecoder {
|
fun jwtDecoder(): JwtDecoder {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
val jwtDecoder = NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).build()
|
.jwsAlgorithm(RS512).build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
@@ -622,8 +630,10 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
JwtDecoder jwtDecoder() {
|
JwtDecoder jwtDecoder() {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build();
|
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -633,8 +643,10 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): JwtDecoder {
|
fun jwtDecoder(): JwtDecoder {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
val jwtDecoder = NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build()
|
.jwsAlgorithm(RS512).jwsAlgorithm(ES512).build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
@@ -649,11 +661,13 @@ Java::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
JwtDecoder jwtDecoder() {
|
JwtDecoder jwtDecoder() {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithms(algorithms -> {
|
.jwsAlgorithms(algorithms -> {
|
||||||
algorithms.add(RS512);
|
algorithms.add(RS512);
|
||||||
algorithms.add(ES512);
|
algorithms.add(ES512);
|
||||||
}).build();
|
}).build();
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer));
|
||||||
|
return jwtDecoder;
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
|
|
||||||
@@ -663,11 +677,13 @@ Kotlin::
|
|||||||
----
|
----
|
||||||
@Bean
|
@Bean
|
||||||
fun jwtDecoder(): JwtDecoder {
|
fun jwtDecoder(): JwtDecoder {
|
||||||
return NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
val jwtDecoder = NimbusJwtDecoder.withIssuerLocation(this.issuer)
|
||||||
.jwsAlgorithms {
|
.jwsAlgorithms {
|
||||||
it.add(RS512)
|
it.add(RS512)
|
||||||
it.add(ES512)
|
it.add(ES512)
|
||||||
}.build()
|
}.build()
|
||||||
|
jwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.issuer))
|
||||||
|
return jwtDecoder
|
||||||
}
|
}
|
||||||
----
|
----
|
||||||
======
|
======
|
||||||
|
|||||||
Reference in New Issue
Block a user