client, jsp -> html , test flow
parent
8be351e22b
commit
83e5f02531
|
@ -15,6 +15,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
||||||
import org.springframework.security.config.Customizer;
|
import org.springframework.security.config.Customizer;
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||||
import org.springframework.security.config.http.SessionCreationPolicy;
|
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.core.oidc.OidcScopes;
|
||||||
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
|
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
|
||||||
import org.springframework.security.oauth2.jwt.JwtClaimsSet;
|
import org.springframework.security.oauth2.jwt.JwtClaimsSet;
|
||||||
|
@ -137,12 +138,18 @@ public class OAuth2ServerConfiguration {
|
||||||
private Consumer<OidcProviderConfiguration.Builder> oidcProviderConfigurationCustomizer() {
|
private Consumer<OidcProviderConfiguration.Builder> oidcProviderConfigurationCustomizer() {
|
||||||
return builder -> {
|
return builder -> {
|
||||||
builder.idTokenSigningAlgorithms(strings -> {
|
builder.idTokenSigningAlgorithms(strings -> {
|
||||||
strings.add(SignatureAlgorithm.ES256.getName());
|
strings.add(SignatureAlgorithm.ES256.getName());
|
||||||
}).scopes(strings -> {
|
}).grantTypes(grantTypes -> {
|
||||||
strings.add(OidcScopes.PROFILE);
|
//向下兼容添加,v3.0.0
|
||||||
strings.add(OidcScopes.EMAIL);
|
grantTypes.add(AuthorizationGrantType.PASSWORD.getValue());
|
||||||
strings.add(OidcScopes.PHONE);
|
grantTypes.add(AuthorizationGrantType.JWT_BEARER.getValue());
|
||||||
});
|
})
|
||||||
|
.scopes(strings -> {
|
||||||
|
strings.add(OidcScopes.PROFILE);
|
||||||
|
strings.add(OidcScopes.EMAIL);
|
||||||
|
strings.add(OidcScopes.ADDRESS);
|
||||||
|
strings.add(OidcScopes.PHONE);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,6 @@ import com.monkeyk.sos.infrastructure.PasswordHandler;
|
||||||
import org.apache.commons.lang3.RandomStringUtils;
|
import org.apache.commons.lang3.RandomStringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import static com.monkeyk.sos.config.OAuth2ServerConfiguration.RESOURCE_ID;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 2019/7/6
|
* 2019/7/6
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue