Browse Source

Removed authorizationGrantType from ClientRegistration

pull/3557/head
vzikratyi 6 years ago
parent
commit
909a989e14
  1. 1
      common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistration.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
  3. 3
      dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
  4. 1
      dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java

1
common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistration.java

@ -35,7 +35,6 @@ public class OAuth2ClientRegistration {
private String tokenUri;
private String redirectUriTemplate;
private String scope;
private String authorizationGrantType;
private String userInfoUri;
private String userNameAttributeName;
private String jwkSetUri;

2
dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java

@ -47,7 +47,7 @@ public class HybridClientRegistrationRepository implements ClientRegistrationRep
.redirectUriTemplate(localClientRegistration.getRedirectUriTemplate())
.scope(localClientRegistration.getScope().split(","))
.clientName(localClientRegistration.getClientName())
.authorizationGrantType(new AuthorizationGrantType(localClientRegistration.getAuthorizationGrantType()))
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
.userInfoUri(localClientRegistration.getUserInfoUri())
.userNameAttributeName(localClientRegistration.getUserNameAttributeName())
.jwkSetUri(localClientRegistration.getJwkSetUri())

3
dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java

@ -473,9 +473,6 @@ public class OAuth2ServiceImpl implements OAuth2Service {
if (StringUtils.isEmpty(clientRegistration.getScope())) {
throw new DataValidationException("Scope should be specified!");
}
if (StringUtils.isEmpty(clientRegistration.getAuthorizationGrantType())) {
throw new DataValidationException("Authorization grant type should be specified!");
}
if (StringUtils.isEmpty(clientRegistration.getUserInfoUri())) {
throw new DataValidationException("User info uri should be specified!");
}

1
dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java

@ -403,7 +403,6 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
.tokenUri("tokenUri")
.redirectUriTemplate("http://localhost:8080/login/oauth2/code/")
.scope("scope")
.authorizationGrantType("authorizationGrantType")
.userInfoUri("userInfoUri")
.userNameAttributeName("userNameAttributeName")
.jwkSetUri("jwkSetUri")

Loading…
Cancel
Save