From de7c43d92b3a103086d07d6954f773b3ad6aa146 Mon Sep 17 00:00:00 2001
From: vzikratyi <vzikratyi@thingsboard.io>
Date: Fri, 19 Jun 2020 18:25:01 +0300
Subject: [PATCH] Renamed 'user_name_attribute' to 'user_name_attribute_name'

---
 .../src/main/data/upgrade/3.1.0/schema_update.sql      |  2 +-
 .../common/data/oauth2/OAuth2ClientRegistration.java   |  6 +++---
 .../thingsboard/server/dao/model/ModelConstants.java   |  2 +-
 .../dao/model/sql/OAuth2ClientRegistrationEntity.java  | 10 ++++------
 .../dao/oauth2/HybridClientRegistrationRepository.java |  2 +-
 .../oauth2/OAuth2ClientRegistrationServiceImpl.java    |  8 ++------
 .../server/dao/oauth2/OAuth2ServiceImpl.java           |  2 +-
 dao/src/main/resources/sql/schema-entities-hsql.sql    |  2 +-
 dao/src/main/resources/sql/schema-entities.sql         |  2 +-
 9 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/application/src/main/data/upgrade/3.1.0/schema_update.sql b/application/src/main/data/upgrade/3.1.0/schema_update.sql
index fc334929b4..645cc7a6ad 100644
--- a/application/src/main/data/upgrade/3.1.0/schema_update.sql
+++ b/application/src/main/data/upgrade/3.1.0/schema_update.sql
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration (
     scope                               varchar(255),
     authorization_grant_type            varchar(255),
     user_info_uri                       varchar(255),
-    user_name_attribute                 varchar(255),
+    user_name_attribute_name            varchar(255),
     jwk_set_uri                         varchar(255),
     client_authentication_method        varchar(255),
     client_name                         varchar(255),
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistration.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistration.java
index fc855e24f1..84c95df84c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistration.java
@@ -19,7 +19,7 @@ public class OAuth2ClientRegistration extends BaseData<OAuth2IntegrationId> {
     private String scope;
     private String authorizationGrantType;
     private String userInfoUri;
-    private String userNameAttribute;
+    private String userNameAttributeName;
     private String jwkSetUri;
     private String clientAuthenticationMethod;
     private String clientName;
@@ -35,7 +35,7 @@ public class OAuth2ClientRegistration extends BaseData<OAuth2IntegrationId> {
     }
 
     @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);
         this.registrationId = registrationId;
         this.clientId = clientId;
@@ -46,7 +46,7 @@ public class OAuth2ClientRegistration extends BaseData<OAuth2IntegrationId> {
         this.scope = scope;
         this.authorizationGrantType = authorizationGrantType;
         this.userInfoUri = userInfoUri;
-        this.userNameAttribute = userNameAttribute;
+        this.userNameAttributeName = userNameAttributeName;
         this.jwkSetUri = jwkSetUri;
         this.clientAuthenticationMethod = clientAuthenticationMethod;
         this.clientName = clientName;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
index 2f967b648b..4deee9fe78 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
@@ -367,7 +367,7 @@ public class ModelConstants {
     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_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_CLIENT_AUTHENTICATION_METHOD_PROPERTY = "client_authentication_method";
     public static final String OAUTH2_CLIENT_NAME_PROPERTY = "client_name";
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java
index 70e9c034dc..c3c96c1838 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java
@@ -17,9 +17,7 @@ package org.thingsboard.server.dao.model.sql;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 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.oauth2.*;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
@@ -53,8 +51,8 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
     private String authorizationGrantType;
     @Column(name = ModelConstants.OAUTH2_USER_INFO_URI_PROPERTY)
     private String userInfoUri;
-    @Column(name = ModelConstants.OAUTH2_USER_NAME_ATTRIBUTE_PROPERTY)
-    private String userNameAttribute;
+    @Column(name = ModelConstants.OAUTH2_USER_NAME_ATTRIBUTE_NAME_PROPERTY)
+    private String userNameAttributeName;
     @Column(name = ModelConstants.OAUTH2_JWK_SET_URI_PROPERTY)
     private String jwkSetUri;
     @Column(name = ModelConstants.OAUTH2_CLIENT_AUTHENTICATION_METHOD_PROPERTY)
@@ -113,7 +111,7 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
         this.scope = clientRegistration.getScope();
         this.authorizationGrantType = clientRegistration.getAuthorizationGrantType();
         this.userInfoUri = clientRegistration.getUserInfoUri();
-        this.userNameAttribute = clientRegistration.getUserNameAttribute();
+        this.userNameAttributeName = clientRegistration.getUserNameAttributeName();
         this.jwkSetUri = clientRegistration.getJwkSetUri();
         this.clientAuthenticationMethod = clientRegistration.getClientAuthenticationMethod();
         this.clientName = clientRegistration.getClientName();
@@ -181,7 +179,7 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
                 .scope(scope)
                 .authorizationGrantType(authorizationGrantType)
                 .userInfoUri(userInfoUri)
-                .userNameAttribute(userNameAttribute)
+                .userNameAttributeName(userNameAttributeName)
                 .jwkSetUri(jwkSetUri)
                 .clientAuthenticationMethod(clientAuthenticationMethod)
                 .clientName(clientName)
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
index 72088e8151..e2e38a01e6 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
@@ -34,7 +34,7 @@ public class HybridClientRegistrationRepository implements ClientRegistrationRep
                 .clientName(localClientRegistration.getClientName())
                 .authorizationGrantType(new AuthorizationGrantType(localClientRegistration.getAuthorizationGrantType()))
                 .userInfoUri(localClientRegistration.getUserInfoUri())
-                .userNameAttributeName(localClientRegistration.getUserNameAttribute())
+                .userNameAttributeName(localClientRegistration.getUserNameAttributeName())
                 .jwkSetUri(localClientRegistration.getJwkSetUri())
                 .clientAuthenticationMethod(new ClientAuthenticationMethod(localClientRegistration.getClientAuthenticationMethod()))
                 .build();
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java
index 699f7acd81..85e5ff84d8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationServiceImpl.java
@@ -19,16 +19,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 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.dao.exception.DataValidationException;
 
 import java.util.List;
 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.validateString;
 
@@ -94,8 +90,8 @@ public class OAuth2ClientRegistrationServiceImpl implements OAuth2ClientRegistra
         if (StringUtils.isEmpty(clientRegistration.getUserInfoUri())) {
             throw new DataValidationException("User info uri should be specified!");
         }
-        if (StringUtils.isEmpty(clientRegistration.getUserNameAttribute())) {
-            throw new DataValidationException("User name attribute should be specified!");
+        if (StringUtils.isEmpty(clientRegistration.getUserNameAttributeName())) {
+            throw new DataValidationException("User name attribute name should be specified!");
         }
         if (StringUtils.isEmpty(clientRegistration.getJwkSetUri())) {
             throw new DataValidationException("Jwk set uri should be specified!");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
index 760f2554fe..3e128a0a52 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
@@ -136,7 +136,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
                 .scope(oAuth2Client.getScope())
                 .authorizationGrantType(oAuth2Client.getAuthorizationGrantType())
                 .userInfoUri(oAuth2Client.getUserInfoUri())
-                .userNameAttribute(oAuth2Client.getUserNameAttributeName())
+                .userNameAttributeName(oAuth2Client.getUserNameAttributeName())
                 .jwkSetUri(oAuth2Client.getJwkSetUri())
                 .clientAuthenticationMethod(oAuth2Client.getClientAuthenticationMethod())
                 .clientName(oAuth2Client.getClientName())
diff --git a/dao/src/main/resources/sql/schema-entities-hsql.sql b/dao/src/main/resources/sql/schema-entities-hsql.sql
index 425d303f2d..72785c1bb0 100644
--- a/dao/src/main/resources/sql/schema-entities-hsql.sql
+++ b/dao/src/main/resources/sql/schema-entities-hsql.sql
@@ -264,7 +264,7 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration (
     scope                               varchar(255),
     authorization_grant_type            varchar(255),
     user_info_uri                       varchar(255),
-    user_name_attribute                 varchar(255),
+    user_name_attribute_name            varchar(255),
     jwk_set_uri                         varchar(255),
     client_authentication_method        varchar(255),
     client_name                         varchar(255),
diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
index 42aabf72db..e83e4720ca 100644
--- a/dao/src/main/resources/sql/schema-entities.sql
+++ b/dao/src/main/resources/sql/schema-entities.sql
@@ -264,7 +264,7 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration (
     scope                               varchar(255),
     authorization_grant_type            varchar(255),
     user_info_uri                       varchar(255),
-    user_name_attribute                 varchar(255),
+    user_name_attribute_name            varchar(255),
     jwk_set_uri                         varchar(255),
     client_authentication_method        varchar(255),
     client_name                         varchar(255),