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

Renamed 'user_name_attribute' to 'user_name_attribute_name'

Browse Source
This commit is contained in:
vzikratyi 2020-06-19 18:25:01 +03:00
parent 5586eed4b7
commit de7c43d92b
9 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/data/upgrade/3.1.0/schema_update.sql
View File

@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration (
scope varchar(255), scope varchar(255),
authorization_grant_type varchar(255), authorization_grant_type varchar(255),
user_info_uri varchar(255), user_info_uri varchar(255),
user_name_attribute varchar(255), user_name_attribute_name varchar(255),
jwk_set_uri varchar(255), jwk_set_uri varchar(255),
client_authentication_method varchar(255), client_authentication_method varchar(255),
client_name varchar(255), client_name varchar(255),

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

@ -19,7 +19,7 @@ public class OAuth2ClientRegistration extends BaseData<OAuth2IntegrationId> {
private String scope; private String scope;
private String authorizationGrantType; private String authorizationGrantType;
private String userInfoUri; private String userInfoUri;
private String userNameAttribute; private String userNameAttributeName;
private String jwkSetUri; private String jwkSetUri;
private String clientAuthenticationMethod; private String clientAuthenticationMethod;
private String clientName; private String clientName;
@ -35,7 +35,7 @@ public class OAuth2ClientRegistration extends BaseData<OAuth2IntegrationId> {
} }
@Builder(toBuilder = true) @Builder(toBuilder = true)
public OAuth2ClientRegistration(OAuth2IntegrationId id, String registrationId, String clientId, String clientSecret, String authorizationUri, String tokenUri, String redirectUriTemplate, String scope, String authorizationGrantType, String userInfoUri, String userNameAttribute, String jwkSetUri, String clientAuthenticationMethod, String clientName, String loginButtonLabel, String loginButtonIcon, OAuth2MapperConfig mapperConfig) { public OAuth2ClientRegistration(OAuth2IntegrationId id, String registrationId, String clientId, String clientSecret, String authorizationUri, String tokenUri, String redirectUriTemplate, String scope, String authorizationGrantType, String userInfoUri, String userNameAttributeName, String jwkSetUri, String clientAuthenticationMethod, String clientName, String loginButtonLabel, String loginButtonIcon, OAuth2MapperConfig mapperConfig) {
super(id); super(id);
this.registrationId = registrationId; this.registrationId = registrationId;
this.clientId = clientId; this.clientId = clientId;
@ -46,7 +46,7 @@ public class OAuth2ClientRegistration extends BaseData<OAuth2IntegrationId> {
this.scope = scope; this.scope = scope;
this.authorizationGrantType = authorizationGrantType; this.authorizationGrantType = authorizationGrantType;
this.userInfoUri = userInfoUri; this.userInfoUri = userInfoUri;
this.userNameAttribute = userNameAttribute; this.userNameAttributeName = userNameAttributeName;
this.jwkSetUri = jwkSetUri; this.jwkSetUri = jwkSetUri;
this.clientAuthenticationMethod = clientAuthenticationMethod; this.clientAuthenticationMethod = clientAuthenticationMethod;
this.clientName = clientName; this.clientName = clientName;

2
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
View File

@ -367,7 +367,7 @@ public class ModelConstants {
public static final String OAUTH2_SCOPE_PROPERTY = "scope"; public static final String OAUTH2_SCOPE_PROPERTY = "scope";
public static final String OAUTH2_AUTHORIZATION_GRANT_TYPE_PROPERTY = "authorization_grant_type"; public static final String OAUTH2_AUTHORIZATION_GRANT_TYPE_PROPERTY = "authorization_grant_type";
public static final String OAUTH2_USER_INFO_URI_PROPERTY = "user_info_uri"; public static final String OAUTH2_USER_INFO_URI_PROPERTY = "user_info_uri";
public static final String OAUTH2_USER_NAME_ATTRIBUTE_PROPERTY = "user_name_attribute"; public static final String OAUTH2_USER_NAME_ATTRIBUTE_NAME_PROPERTY = "user_name_attribute_name";
public static final String OAUTH2_JWK_SET_URI_PROPERTY = "jwk_set_uri"; public static final String OAUTH2_JWK_SET_URI_PROPERTY = "jwk_set_uri";
public static final String OAUTH2_CLIENT_AUTHENTICATION_METHOD_PROPERTY = "client_authentication_method"; public static final String OAUTH2_CLIENT_AUTHENTICATION_METHOD_PROPERTY = "client_authentication_method";
public static final String OAUTH2_CLIENT_NAME_PROPERTY = "client_name"; public static final String OAUTH2_CLIENT_NAME_PROPERTY = "client_name";

10
dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java
View File

@ -17,9 +17,7 @@ package org.thingsboard.server.dao.model.sql;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDef;
import org.thingsboard.server.common.data.EntityView;
import org.thingsboard.server.common.data.id.OAuth2IntegrationId; import org.thingsboard.server.common.data.id.OAuth2IntegrationId;
import org.thingsboard.server.common.data.oauth2.*; import org.thingsboard.server.common.data.oauth2.*;
import org.thingsboard.server.dao.model.BaseSqlEntity; import org.thingsboard.server.dao.model.BaseSqlEntity;
@ -53,8 +51,8 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
private String authorizationGrantType; private String authorizationGrantType;
@Column(name = ModelConstants.OAUTH2_USER_INFO_URI_PROPERTY) @Column(name = ModelConstants.OAUTH2_USER_INFO_URI_PROPERTY)
private String userInfoUri; private String userInfoUri;
@Column(name = ModelConstants.OAUTH2_USER_NAME_ATTRIBUTE_PROPERTY) @Column(name = ModelConstants.OAUTH2_USER_NAME_ATTRIBUTE_NAME_PROPERTY)
private String userNameAttribute; private String userNameAttributeName;
@Column(name = ModelConstants.OAUTH2_JWK_SET_URI_PROPERTY) @Column(name = ModelConstants.OAUTH2_JWK_SET_URI_PROPERTY)
private String jwkSetUri; private String jwkSetUri;
@Column(name = ModelConstants.OAUTH2_CLIENT_AUTHENTICATION_METHOD_PROPERTY) @Column(name = ModelConstants.OAUTH2_CLIENT_AUTHENTICATION_METHOD_PROPERTY)
@ -113,7 +111,7 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
this.scope = clientRegistration.getScope(); this.scope = clientRegistration.getScope();
this.authorizationGrantType = clientRegistration.getAuthorizationGrantType(); this.authorizationGrantType = clientRegistration.getAuthorizationGrantType();
this.userInfoUri = clientRegistration.getUserInfoUri(); this.userInfoUri = clientRegistration.getUserInfoUri();
this.userNameAttribute = clientRegistration.getUserNameAttribute(); this.userNameAttributeName = clientRegistration.getUserNameAttributeName();
this.jwkSetUri = clientRegistration.getJwkSetUri(); this.jwkSetUri = clientRegistration.getJwkSetUri();
this.clientAuthenticationMethod = clientRegistration.getClientAuthenticationMethod(); this.clientAuthenticationMethod = clientRegistration.getClientAuthenticationMethod();
this.clientName = clientRegistration.getClientName(); this.clientName = clientRegistration.getClientName();
@ -181,7 +179,7 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
.scope(scope) .scope(scope)
.authorizationGrantType(authorizationGrantType) .authorizationGrantType(authorizationGrantType)
.userInfoUri(userInfoUri) .userInfoUri(userInfoUri)
.userNameAttribute(userNameAttribute) .userNameAttributeName(userNameAttributeName)
.jwkSetUri(jwkSetUri) .jwkSetUri(jwkSetUri)
.clientAuthenticationMethod(clientAuthenticationMethod) .clientAuthenticationMethod(clientAuthenticationMethod)
.clientName(clientName) .clientName(clientName)

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

@ -34,7 +34,7 @@ public class HybridClientRegistrationRepository implements ClientRegistrationRep
.clientName(localClientRegistration.getClientName()) .clientName(localClientRegistration.getClientName())
.authorizationGrantType(new AuthorizationGrantType(localClientRegistration.getAuthorizationGrantType())) .authorizationGrantType(new AuthorizationGrantType(localClientRegistration.getAuthorizationGrantType()))
.userInfoUri(localClientRegistration.getUserInfoUri()) .userInfoUri(localClientRegistration.getUserInfoUri())
.userNameAttributeName(localClientRegistration.getUserNameAttribute()) .userNameAttributeName(localClientRegistration.getUserNameAttributeName())
.jwkSetUri(localClientRegistration.getJwkSetUri()) .jwkSetUri(localClientRegistration.getJwkSetUri())
.clientAuthenticationMethod(new ClientAuthenticationMethod(localClientRegistration.getClientAuthenticationMethod())) .clientAuthenticationMethod(new ClientAuthenticationMethod(localClientRegistration.getClientAuthenticationMethod()))
.build(); .build();

8
dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java
View File

@ -19,16 +19,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.oauth2.*; import org.thingsboard.server.common.data.oauth2.*;
import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DataValidationException;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validateId;
import static org.thingsboard.server.dao.service.Validator.validateString; import static org.thingsboard.server.dao.service.Validator.validateString;
@ -94,8 +90,8 @@ public class OAuth2ClientRegistrationServiceImpl implements OAuth2ClientRegistra
if (StringUtils.isEmpty(clientRegistration.getUserInfoUri())) { if (StringUtils.isEmpty(clientRegistration.getUserInfoUri())) {
throw new DataValidationException("User info uri should be specified!"); throw new DataValidationException("User info uri should be specified!");
} }
if (StringUtils.isEmpty(clientRegistration.getUserNameAttribute())) { if (StringUtils.isEmpty(clientRegistration.getUserNameAttributeName())) {
throw new DataValidationException("User name attribute should be specified!"); throw new DataValidationException("User name attribute name should be specified!");
} }
if (StringUtils.isEmpty(clientRegistration.getJwkSetUri())) { if (StringUtils.isEmpty(clientRegistration.getJwkSetUri())) {
throw new DataValidationException("Jwk set uri should be specified!"); throw new DataValidationException("Jwk set uri should be specified!");

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

@ -136,7 +136,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
.scope(oAuth2Client.getScope()) .scope(oAuth2Client.getScope())
.authorizationGrantType(oAuth2Client.getAuthorizationGrantType()) .authorizationGrantType(oAuth2Client.getAuthorizationGrantType())
.userInfoUri(oAuth2Client.getUserInfoUri()) .userInfoUri(oAuth2Client.getUserInfoUri())
.userNameAttribute(oAuth2Client.getUserNameAttributeName()) .userNameAttributeName(oAuth2Client.getUserNameAttributeName())
.jwkSetUri(oAuth2Client.getJwkSetUri()) .jwkSetUri(oAuth2Client.getJwkSetUri())
.clientAuthenticationMethod(oAuth2Client.getClientAuthenticationMethod()) .clientAuthenticationMethod(oAuth2Client.getClientAuthenticationMethod())
.clientName(oAuth2Client.getClientName()) .clientName(oAuth2Client.getClientName())

2
dao/src/main/resources/sql/schema-entities-hsql.sql
View File

@ -264,7 +264,7 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration (
scope varchar(255), scope varchar(255),
authorization_grant_type varchar(255), authorization_grant_type varchar(255),
user_info_uri varchar(255), user_info_uri varchar(255),
user_name_attribute varchar(255), user_name_attribute_name varchar(255),
jwk_set_uri varchar(255), jwk_set_uri varchar(255),
client_authentication_method varchar(255), client_authentication_method varchar(255),
client_name varchar(255), client_name varchar(255),

2
dao/src/main/resources/sql/schema-entities.sql
View File

@ -264,7 +264,7 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration (
scope varchar(255), scope varchar(255),
authorization_grant_type varchar(255), authorization_grant_type varchar(255),
user_info_uri varchar(255), user_info_uri varchar(255),
user_name_attribute varchar(255), user_name_attribute_name varchar(255),
jwk_set_uri varchar(255), jwk_set_uri varchar(255),
client_authentication_method varchar(255), client_authentication_method varchar(255),
client_name varchar(255), client_name varchar(255),