Skip to content

Commit c1e9c1d

Browse files
committed
Change JwtClaimsSet.Builder.issuer() to String
Issue gh-81
1 parent a9423c6 commit c1e9c1d

File tree

4 files changed

+4
-20
lines changed

4 files changed

+4
-20
lines changed

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.springframework.util.Assert;
1919

20-
import java.net.URL;
2120
import java.time.Instant;
2221
import java.util.Collections;
2322
import java.util.LinkedHashMap;
@@ -94,7 +93,7 @@ private Builder(JwtClaimsSet claims) {
9493
* @param issuer the issuer identifier
9594
* @return the {@link Builder}
9695
*/
97-
public Builder issuer(URL issuer) {
96+
public Builder issuer(String issuer) {
9897
return claim(ISS, issuer);
9998
}
10099

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIssuerUtil.java

+1-9
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
import org.springframework.security.oauth2.jwt.JwtClaimsSet;
2727
import org.springframework.security.oauth2.jwt.JwtEncoder;
2828

29-
import java.net.MalformedURLException;
30-
import java.net.URI;
31-
import java.net.URL;
3229
import java.time.Duration;
3330
import java.time.Instant;
3431
import java.time.temporal.ChronoUnit;
@@ -47,12 +44,7 @@ class OAuth2TokenIssuerUtil {
4744
static Jwt issueJwtAccessToken(JwtEncoder jwtEncoder, String subject, String audience, Set<String> scopes) {
4845
JoseHeader joseHeader = JoseHeader.withAlgorithm(SignatureAlgorithm.RS256).build();
4946

50-
// TODO Allow configuration for issuer claim
51-
URL issuer = null;
52-
try {
53-
issuer = URI.create("https://oauth2.provider.com").toURL();
54-
} catch (MalformedURLException e) { }
55-
47+
String issuer = "https://oauth2.provider.com"; // TODO Allow configuration for issuer claim
5648
Instant issuedAt = Instant.now();
5749
Instant expiresAt = issuedAt.plus(1, ChronoUnit.HOURS); // TODO Allow configuration for access token time-to-live
5850

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void buildWhenAllClaimsProvidedThenAllClaimsAreSet() {
3939
JwtClaimsSet expectedJwtClaimsSet = TestJwtClaimsSets.jwtClaimsSet().build();
4040

4141
JwtClaimsSet jwtClaimsSet = JwtClaimsSet.withClaims()
42-
.issuer(expectedJwtClaimsSet.getIssuer())
42+
.issuer(expectedJwtClaimsSet.getIssuer().toExternalForm())
4343
.subject(expectedJwtClaimsSet.getSubject())
4444
.audience(expectedJwtClaimsSet.getAudience())
4545
.issuedAt(expectedJwtClaimsSet.getIssuedAt())

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
*/
1616
package org.springframework.security.oauth2.jwt;
1717

18-
import java.net.MalformedURLException;
19-
import java.net.URI;
20-
import java.net.URL;
2118
import java.time.Instant;
2219
import java.time.temporal.ChronoUnit;
2320
import java.util.Collections;
@@ -29,11 +26,7 @@
2926
public class TestJwtClaimsSets {
3027

3128
public static JwtClaimsSet.Builder jwtClaimsSet() {
32-
URL issuer = null;
33-
try {
34-
issuer = URI.create("https://provider.com").toURL();
35-
} catch (MalformedURLException e) { }
36-
29+
String issuer = "https://provider.com";
3730
Instant issuedAt = Instant.now();
3831
Instant expiresAt = issuedAt.plus(1, ChronoUnit.HOURS);
3932

0 commit comments

Comments
 (0)