dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added removing full OAuth2 config on tenant deletion

Browse Source
This commit is contained in:
vzikratyi 2020-06-24 15:58:08 +03:00
parent 32b9f58997
commit 84a06e65fa
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
View File

@ -37,7 +37,7 @@ public interface OAuth2Service {
OAuth2ClientsParams getTenantOAuth2ClientsParams(TenantId tenantId); OAuth2ClientsParams getTenantOAuth2ClientsParams(TenantId tenantId);
void deleteDomainOAuth2ClientRegistrationByTenant(TenantId tenantId); void deleteTenantOAuth2ClientsParams(TenantId tenantId);
boolean isOAuth2ClientRegistrationAllowed(TenantId tenantId); boolean isOAuth2ClientRegistrationAllowed(TenantId tenantId);

5
dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
View File

@ -291,12 +291,13 @@ public class OAuth2ServiceImpl implements OAuth2Service {
} }
@Override @Override
public void deleteDomainOAuth2ClientRegistrationByTenant(TenantId tenantId) { public void deleteTenantOAuth2ClientsParams(TenantId tenantId) {
OAuth2ClientsParams params = getTenantOAuth2ClientsParams(tenantId); OAuth2ClientsParams params = getTenantOAuth2ClientsParams(tenantId);
if (!StringUtils.isEmpty(params.getDomainName())) { if (!StringUtils.isEmpty(params.getDomainName())) {
// TODO don't we need to delete from attributes?
String settingsKey = constructAdminSettingsDomainKey(params.getDomainName()); String settingsKey = constructAdminSettingsDomainKey(params.getDomainName());
adminSettingsService.deleteAdminSettingsByKey(tenantId, settingsKey); adminSettingsService.deleteAdminSettingsByKey(tenantId, settingsKey);
attributesService.removeAll(tenantId, tenantId, DataConstants.SERVER_SCOPE, Collections.singletonList(OAUTH2_CLIENT_REGISTRATIONS_PARAMS));
clientsParams.remove(tenantId);
} }
} }

5
dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View File

@ -21,7 +21,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.asset.Asset;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageData;
@ -41,8 +40,6 @@ import org.thingsboard.server.dao.service.Validator;
import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.dao.user.UserService;
import org.thingsboard.server.dao.widget.WidgetsBundleService; import org.thingsboard.server.dao.widget.WidgetsBundleService;
import java.util.List;
import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validateId;
@Service @Service
@ -108,7 +105,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
public void deleteTenant(TenantId tenantId) { public void deleteTenant(TenantId tenantId) {
log.trace("Executing deleteTenant [{}]", tenantId); log.trace("Executing deleteTenant [{}]", tenantId);
Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId); Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
oAuth2Service.deleteDomainOAuth2ClientRegistrationByTenant(tenantId); oAuth2Service.deleteTenantOAuth2ClientsParams(tenantId);
customerService.deleteCustomersByTenantId(tenantId); customerService.deleteCustomersByTenantId(tenantId);
widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId); widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
dashboardService.deleteDashboardsByTenantId(tenantId); dashboardService.deleteDashboardsByTenantId(tenantId);