dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get 'clientName' from 'registrationId'

Browse Source
This commit is contained in:
vzikratyi 2020-07-10 13:16:34 +03:00
parent 483a3b847b
commit d8fecd18d9
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,6 @@ public class OAuth2ClientRegistration {
private String userNameAttributeName; private String userNameAttributeName;
private String jwkSetUri; private String jwkSetUri;
private String clientAuthenticationMethod; private String clientAuthenticationMethod;
private String clientName;
private String loginButtonLabel; private String loginButtonLabel;
private String loginButtonIcon; private String loginButtonIcon;
} }

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

@ -39,13 +39,13 @@ public class HybridClientRegistrationRepository implements ClientRegistrationRep
private ClientRegistration toSpringClientRegistration(String redirectUriTemplate, OAuth2ClientRegistration localClientRegistration){ private ClientRegistration toSpringClientRegistration(String redirectUriTemplate, OAuth2ClientRegistration localClientRegistration){
return ClientRegistration.withRegistrationId(localClientRegistration.getRegistrationId()) return ClientRegistration.withRegistrationId(localClientRegistration.getRegistrationId())
.clientName(localClientRegistration.getRegistrationId())
.clientId(localClientRegistration.getClientId()) .clientId(localClientRegistration.getClientId())
.authorizationUri(localClientRegistration.getAuthorizationUri()) .authorizationUri(localClientRegistration.getAuthorizationUri())
.clientSecret(localClientRegistration.getClientSecret()) .clientSecret(localClientRegistration.getClientSecret())
.tokenUri(localClientRegistration.getAccessTokenUri()) .tokenUri(localClientRegistration.getAccessTokenUri())
.redirectUriTemplate(redirectUriTemplate) .redirectUriTemplate(redirectUriTemplate)
.scope(localClientRegistration.getScope()) .scope(localClientRegistration.getScope())
.clientName(localClientRegistration.getClientName())
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE) .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
.userInfoUri(localClientRegistration.getUserInfoUri()) .userInfoUri(localClientRegistration.getUserInfoUri())
.userNameAttributeName(localClientRegistration.getUserNameAttributeName()) .userNameAttributeName(localClientRegistration.getUserNameAttributeName())

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

@ -521,9 +521,6 @@ public class OAuth2ServiceImpl implements OAuth2Service {
if (StringUtils.isEmpty(clientRegistration.getClientAuthenticationMethod())) { if (StringUtils.isEmpty(clientRegistration.getClientAuthenticationMethod())) {
throw new DataValidationException("Client authentication method should be specified!"); throw new DataValidationException("Client authentication method should be specified!");
} }
if (StringUtils.isEmpty(clientRegistration.getClientName())) {
throw new DataValidationException("Client name should be specified!");
}
if (StringUtils.isEmpty(clientRegistration.getLoginButtonLabel())) { if (StringUtils.isEmpty(clientRegistration.getLoginButtonLabel())) {
throw new DataValidationException("Login button label should be specified!"); throw new DataValidationException("Login button label should be specified!");
} }

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

@ -493,7 +493,6 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
.userNameAttributeName("userNameAttributeName") .userNameAttributeName("userNameAttributeName")
.jwkSetUri("jwkSetUri") .jwkSetUri("jwkSetUri")
.clientAuthenticationMethod("clientAuthenticationMethod") .clientAuthenticationMethod("clientAuthenticationMethod")
.clientName("clientName")
.loginButtonLabel("loginButtonLabel") .loginButtonLabel("loginButtonLabel")
.build(); .build();
} }