From b08d9cc935023d977ed69a8a763c843ec188bb7d Mon Sep 17 00:00:00 2001
From: vzikratyi <vzikratyi@thingsboard.io>
Date: Fri, 19 Jun 2020 15:56:35 +0300
Subject: [PATCH] Made TenantNameStrategyType as Enum

---
 .../server/common/data/oauth2/OAuth2BasicMapperConfig.java   | 2 +-
 .../server/common/data/oauth2/TenantNameStrategyType.java    | 5 +++++
 .../server/dao/model/sql/OAuth2ClientRegistrationEntity.java | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
index a38390ef81..18bab333fb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
@@ -10,7 +10,7 @@ public class OAuth2BasicMapperConfig {
     private final String emailAttributeKey;
     private final String firstNameAttributeKey;
     private final String lastNameAttributeKey;
-    private final String tenantNameStrategy;
+    private final TenantNameStrategyType tenantNameStrategy;
     private final String tenantNamePattern;
     private final String customerNamePattern;
     private final String defaultDashboardName;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java
new file mode 100644
index 0000000000..e38c7e37dc
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java
@@ -0,0 +1,5 @@
+package org.thingsboard.server.common.data.oauth2;
+
+public enum TenantNameStrategyType {
+    DOMAIN, EMAIL, CUSTOM;
+}
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 66e57faaf4..70e9c034dc 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
@@ -78,8 +78,9 @@ public class OAuth2ClientRegistrationEntity extends BaseSqlEntity<OAuth2ClientRe
     private String firstNameAttributeKey;
     @Column(name = ModelConstants.OAUTH2_LAST_NAME_ATTRIBUTE_KEY_PROPERTY)
     private String lastNameAttributeKey;
+    @Enumerated(EnumType.STRING)
     @Column(name = ModelConstants.OAUTH2_TENANT_NAME_STRATEGY_PROPERTY)
-    private String tenantNameStrategy;
+    private TenantNameStrategyType tenantNameStrategy;
     @Column(name = ModelConstants.OAUTH2_TENANT_NAME_PATTERN_PROPERTY)
     private String tenantNamePattern;
     @Column(name = ModelConstants.OAUTH2_CUSTOMER_NAME_PATTERN_PROPERTY)