From c30e8b3a2d8cfdf3afdf40028422e48916d2c115 Mon Sep 17 00:00:00 2001 From: vzikratyi Date: Thu, 25 Jun 2020 18:04:39 +0300 Subject: [PATCH] Added method to delete system oauth2 config --- .../org/thingsboard/server/dao/oauth2/OAuth2Service.java | 2 ++ .../thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java index a575142499..320a2e650a 100644 --- a/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java +++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java @@ -42,6 +42,8 @@ public interface OAuth2Service { void deleteTenantOAuth2ClientsParams(TenantId tenantId); + void deleteSystemOAuth2ClientsParams(); + boolean isOAuth2ClientRegistrationAllowed(TenantId tenantId); } 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 0bcc67e85a..6d344d9640 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 @@ -352,6 +352,12 @@ public class OAuth2ServiceImpl implements OAuth2Service { clientsParams.remove(tenantId); } + @Override + public void deleteSystemOAuth2ClientsParams() { + adminSettingsService.deleteAdminSettingsByKey(TenantId.SYS_TENANT_ID, OAuth2Utils.OAUTH2_CLIENT_REGISTRATIONS_PARAMS); + clientsParams.remove(TenantId.SYS_TENANT_ID); + } + @Override public boolean isOAuth2ClientRegistrationAllowed(TenantId tenantId) { Tenant tenant = tenantService.findTenantById(tenantId);