diff --git a/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java b/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java index ef6f69c..47db70d 100644 --- a/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java +++ b/src/main/java/com/monkeyk/sos/config/OAuth2ServerConfiguration.java @@ -15,6 +15,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.oidc.OidcScopes; import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm; import org.springframework.security.oauth2.jwt.JwtClaimsSet; @@ -137,12 +138,18 @@ public class OAuth2ServerConfiguration { private Consumer oidcProviderConfigurationCustomizer() { return builder -> { builder.idTokenSigningAlgorithms(strings -> { - strings.add(SignatureAlgorithm.ES256.getName()); - }).scopes(strings -> { - strings.add(OidcScopes.PROFILE); - strings.add(OidcScopes.EMAIL); - strings.add(OidcScopes.PHONE); - }); + strings.add(SignatureAlgorithm.ES256.getName()); + }).grantTypes(grantTypes -> { + //向下兼容添加,v3.0.0 + grantTypes.add(AuthorizationGrantType.PASSWORD.getValue()); + grantTypes.add(AuthorizationGrantType.JWT_BEARER.getValue()); + }) + .scopes(strings -> { + strings.add(OidcScopes.PROFILE); + strings.add(OidcScopes.EMAIL); + strings.add(OidcScopes.ADDRESS); + strings.add(OidcScopes.PHONE); + }); }; } diff --git a/src/test/java/com/monkeyk/sos/service/business/AbstractInlineAccessTokenInvokerTest.java b/src/test/java/com/monkeyk/sos/service/business/AbstractInlineAccessTokenInvokerTest.java index e4bc539..1a0a01e 100644 --- a/src/test/java/com/monkeyk/sos/service/business/AbstractInlineAccessTokenInvokerTest.java +++ b/src/test/java/com/monkeyk/sos/service/business/AbstractInlineAccessTokenInvokerTest.java @@ -10,8 +10,6 @@ import com.monkeyk.sos.infrastructure.PasswordHandler; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; -import static com.monkeyk.sos.config.OAuth2ServerConfiguration.RESOURCE_ID; - /** * 2019/7/6 *