Added loginButton label and icon to OAuth2Template

application/src/main/data/upgrade/3.1.1/schema_update.sql

@@ -75,7 +75,8 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration_template (
     basic_default_dashboard_name varchar(255),
     basic_always_full_screen boolean,
     comment varchar,
-    icon varchar(255),
+    login_button_icon varchar(255),
+    login_button_label varchar(255),
     help_link varchar(255),
     CONSTRAINT oauth2_template_provider_id_unq_key UNIQUE (provider_id)
 );

common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java

@@ -44,7 +44,8 @@ public class OAuth2ClientRegistrationTemplate extends BaseData<OAuth2ClientRegis
     private String jwkSetUri;
     private String clientAuthenticationMethod;
     private String comment;
-    private String icon;
+    private String loginButtonIcon;
+    private String loginButtonLabel;
     private String helpLink;
 
     @Getter(AccessLevel.NONE)
@@ -68,7 +69,8 @@ public class OAuth2ClientRegistrationTemplate extends BaseData<OAuth2ClientRegis
         this.jwkSetUri = clientRegistrationTemplate.jwkSetUri;
         this.clientAuthenticationMethod = clientRegistrationTemplate.clientAuthenticationMethod;
         this.comment = clientRegistrationTemplate.comment;
-        this.icon = clientRegistrationTemplate.icon;
+        this.loginButtonIcon = clientRegistrationTemplate.loginButtonIcon;
+        this.loginButtonLabel = clientRegistrationTemplate.loginButtonLabel;
         this.helpLink = clientRegistrationTemplate.helpLink;
         this.additionalInfo = clientRegistrationTemplate.additionalInfo;
     }

dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java

@@ -391,7 +391,8 @@ public class ModelConstants {
     public static final String OAUTH2_MAPPER_SEND_TOKEN_PROPERTY = "custom_send_token";
     public static final String OAUTH2_TEMPLATE_COMMENT_PROPERTY = "comment";
     public static final String OAUTH2_TEMPLATE_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
-    public static final String OAUTH2_TEMPLATE_ICON_PROPERTY = "icon";
+    public static final String OAUTH2_TEMPLATE_LOGIN_BUTTON_ICON_PROPERTY = OAUTH2_LOGIN_BUTTON_ICON_PROPERTY;
+    public static final String OAUTH2_TEMPLATE_LOGIN_BUTTON_LABEL_PROPERTY = OAUTH2_LOGIN_BUTTON_LABEL_PROPERTY;
     public static final String OAUTH2_TEMPLATE_HELP_LINK_PROPERTY = "help_link";
 
     /**

dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java

@@ -20,7 +20,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
-import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationId;
 import org.thingsboard.server.common.data.id.OAuth2ClientRegistrationTemplateId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.oauth2.*;
@@ -78,8 +77,10 @@ public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2
     private Boolean alwaysFullScreen;
     @Column(name = ModelConstants.OAUTH2_TEMPLATE_COMMENT_PROPERTY)
     private String comment;
-    @Column(name = ModelConstants.OAUTH2_TEMPLATE_ICON_PROPERTY)
-    private String icon;
+    @Column(name = ModelConstants.OAUTH2_TEMPLATE_LOGIN_BUTTON_ICON_PROPERTY)
+    private String loginButtonIcon;
+    @Column(name = ModelConstants.OAUTH2_TEMPLATE_LOGIN_BUTTON_LABEL_PROPERTY)
+    private String loginButtonLabel;
     @Column(name = ModelConstants.OAUTH2_TEMPLATE_HELP_LINK_PROPERTY)
     private String helpLink;
 
@@ -107,7 +108,8 @@ public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2
         this.jwkSetUri = clientRegistrationTemplate.getJwkSetUri();
         this.clientAuthenticationMethod = clientRegistrationTemplate.getClientAuthenticationMethod();
         this.comment = clientRegistrationTemplate.getComment();
-        this.icon = clientRegistrationTemplate.getIcon();
+        this.loginButtonIcon = clientRegistrationTemplate.getLoginButtonIcon();
+        this.loginButtonLabel = clientRegistrationTemplate.getLoginButtonLabel();
         this.helpLink = clientRegistrationTemplate.getHelpLink();
         this.additionalInfo = clientRegistrationTemplate.getAdditionalInfo();
         OAuth2BasicMapperConfig basicConfig = clientRegistrationTemplate.getBasic();
@@ -152,7 +154,8 @@ public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2
         clientRegistrationTemplate.setJwkSetUri(jwkSetUri);
         clientRegistrationTemplate.setClientAuthenticationMethod(clientAuthenticationMethod);
         clientRegistrationTemplate.setComment(comment);
-        clientRegistrationTemplate.setIcon(icon);
+        clientRegistrationTemplate.setLoginButtonIcon(loginButtonIcon);
+        clientRegistrationTemplate.setLoginButtonLabel(loginButtonLabel);
         clientRegistrationTemplate.setHelpLink(helpLink);
         return clientRegistrationTemplate;
     }

dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java

@@ -79,7 +79,7 @@ public class OAuth2ConfigTemplateServiceImpl extends AbstractEntityService imple
         clientRegistrationTemplateDao.removeById(TenantId.SYS_TENANT_ID, templateId.getId());
     }
 
-    private DataValidator<OAuth2ClientRegistrationTemplate> clientRegistrationTemplateValidator =
+    private final DataValidator<OAuth2ClientRegistrationTemplate> clientRegistrationTemplateValidator =
             new DataValidator<OAuth2ClientRegistrationTemplate>() {
 
                 @Override

dao/src/main/resources/sql/schema-entities-hsql.sql

@@ -348,7 +348,8 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration_template (
     basic_default_dashboard_name varchar(255),
     basic_always_full_screen boolean,
     comment varchar,
-    icon varchar(255),
+    login_button_icon varchar(255),
+    login_button_label varchar(255),
     help_link varchar(255),
     CONSTRAINT oauth2_template_provider_id_unq_key UNIQUE (provider_id)
 );

dao/src/main/resources/sql/schema-entities.sql

@@ -373,7 +373,8 @@ CREATE TABLE IF NOT EXISTS oauth2_client_registration_template (
     basic_default_dashboard_name varchar(255),
     basic_always_full_screen boolean,
     comment varchar,
-    icon varchar(255),
+    login_button_icon varchar(255),
+    login_button_label varchar(255),
     help_link varchar(255),
     CONSTRAINT oauth2_template_provider_id_unq_key UNIQUE (provider_id)
 );

dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java

@@ -125,7 +125,8 @@ public class BaseOAuth2ConfigTemplateServiceTest extends AbstractServiceTest {
         clientRegistrationTemplate.setJwkSetUri("jwkSetUri");
         clientRegistrationTemplate.setClientAuthenticationMethod("clientAuthenticationMethod");
         clientRegistrationTemplate.setComment("comment");
-        clientRegistrationTemplate.setIcon("icon");
+        clientRegistrationTemplate.setLoginButtonIcon("icon");
+        clientRegistrationTemplate.setLoginButtonLabel("label");
         clientRegistrationTemplate.setHelpLink("helpLink");
         return clientRegistrationTemplate;
     }