Browse Source

Made TenantNameStrategyType as Enum

pull/3557/head
vzikratyi 6 years ago
parent
commit
b08d9cc935
  1. 2
      common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
  2. 5
      common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java
  3. 3
      dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationEntity.java

2
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;

5
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;
}

3
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)

Loading…
Cancel
Save