From d8fecd18d9cd3bb97a90827772393ca055b5dca0 Mon Sep 17 00:00:00 2001
From: vzikratyi <vzikratyi@thingsboard.io>
Date: Fri, 10 Jul 2020 13:16:34 +0300
Subject: [PATCH] Get 'clientName' from 'registrationId'

---
 .../server/common/data/oauth2/OAuth2ClientRegistration.java    | 1 -
 .../server/dao/oauth2/HybridClientRegistrationRepository.java  | 2 +-
 .../org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java   | 3 ---
 .../thingsboard/server/dao/service/BaseOAuth2ServiceTest.java  | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

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 2051e4b850..0a4156bcc5 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
@@ -40,7 +40,6 @@ public class OAuth2ClientRegistration {
     private String userNameAttributeName;
     private String jwkSetUri;
     private String clientAuthenticationMethod;
-    private String clientName;
     private String loginButtonLabel;
     private String loginButtonIcon;
 }
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 ab8a14e078..7309cc7edb 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
@@ -39,13 +39,13 @@ public class HybridClientRegistrationRepository implements ClientRegistrationRep
 
     private ClientRegistration toSpringClientRegistration(String redirectUriTemplate, OAuth2ClientRegistration localClientRegistration){
         return ClientRegistration.withRegistrationId(localClientRegistration.getRegistrationId())
+                .clientName(localClientRegistration.getRegistrationId())
                 .clientId(localClientRegistration.getClientId())
                 .authorizationUri(localClientRegistration.getAuthorizationUri())
                 .clientSecret(localClientRegistration.getClientSecret())
                 .tokenUri(localClientRegistration.getAccessTokenUri())
                 .redirectUriTemplate(redirectUriTemplate)
                 .scope(localClientRegistration.getScope())
-                .clientName(localClientRegistration.getClientName())
                 .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
                 .userInfoUri(localClientRegistration.getUserInfoUri())
                 .userNameAttributeName(localClientRegistration.getUserNameAttributeName())
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 25dec8e696..92790b3d98 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
@@ -521,9 +521,6 @@ public class OAuth2ServiceImpl implements OAuth2Service {
         if (StringUtils.isEmpty(clientRegistration.getClientAuthenticationMethod())) {
             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())) {
             throw new DataValidationException("Login button label should be specified!");
         }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
index e502b660ec..ab572e7e53 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
@@ -493,7 +493,6 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
                 .userNameAttributeName("userNameAttributeName")
                 .jwkSetUri("jwkSetUri")
                 .clientAuthenticationMethod("clientAuthenticationMethod")
-                .clientName("clientName")
                 .loginButtonLabel("loginButtonLabel")
                 .build();
     }