Added 'deleteByDomain' for OAuth2Service

@@ -47,6 +47,7 @@ import java.util.List;
 @Slf4j
 public class OAuth2Controller extends BaseController {
     private static final String CLIENT_REGISTRATION_ID = "clientRegistrationId";
+    private static final String DOMAIN = "domain";
     private static final String CLIENT_REGISTRATION_TEMPLATE_ID = "clientRegistrationTemplateId";
 
     @RequestMapping(value = "/noauth/oauth2Clients", method = RequestMethod.POST)
@@ -131,6 +132,29 @@ public class OAuth2Controller extends BaseController {
         }
     }
 
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/oauth2/config/domain/{domain}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteClientRegistrationForDomain(@PathVariable(DOMAIN) String domain) throws ThingsboardException {
+        checkParameter(DOMAIN, domain);
+        try {
+            oAuth2Service.deleteClientRegistrationsByDomain(getCurrentUser().getTenantId(), domain);
+
+            logEntityAction(emptyId(EntityType.OAUTH2_CLIENT_REGISTRATION), null,
+                    null,
+                    ActionType.DELETED, null, domain);
+
+        } catch (Exception e) {
+            logEntityAction(emptyId(EntityType.OAUTH2_CLIENT_REGISTRATION),
+                    null,
+                    null,
+                    ActionType.DELETED, e, domain);
+
+            throw handleException(e);
+        }
+    }
+
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/oauth2/config/template/{clientRegistrationTemplateId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)

@@ -38,5 +38,7 @@ public interface OAuth2Service {
 
     void deleteClientRegistrationById(TenantId tenantId, OAuth2ClientRegistrationId id);
 
+    void deleteClientRegistrationsByDomain(TenantId tenantId, String domain);
+
     boolean isOAuth2ClientRegistrationAllowed(TenantId tenantId);
 }

@@ -28,5 +28,7 @@ public interface OAuth2ClientRegistrationDao extends Dao<OAuth2ClientRegistratio
 
     List<OAuth2ClientRegistration> findByDomainName(String domainName);
 
+    int removeByTenantIdAndDomainName(UUID tenantId, String domainName);
+
     int removeByTenantId(UUID tenantId);
 }

@@ -100,12 +100,22 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
 
     @Override
     public void deleteClientRegistrationById(TenantId tenantId, OAuth2ClientRegistrationId id) {
-        log.trace("Executing deleteClientRegistrationById [{}]", id);
+        log.trace("Executing deleteClientRegistrationById [{}], [{}]", tenantId, id);
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         validateId(id, INCORRECT_CLIENT_REGISTRATION_ID + id);
         clientRegistrationDao.removeById(tenantId, id.getId());
     }
 
     @Override
+    @Transactional
+    public void deleteClientRegistrationsByDomain(TenantId tenantId, String domain) {
+        log.trace("Executing deleteClientRegistrationsByDomain [{}], [{}]", tenantId, domain);
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateString(domain, INCORRECT_DOMAIN_NAME + domain);
+        clientRegistrationDao.removeByTenantIdAndDomainName(tenantId.getId(), domain);
+    }
+
+    @Override
     public boolean isOAuth2ClientRegistrationAllowed(TenantId tenantId) {
         log.trace("Executing isOAuth2ClientRegistrationAllowed [{}]", tenantId);
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);

@@ -68,6 +68,11 @@ public class JpaOAuth2ClientRegistrationDao extends JpaAbstractDao<OAuth2ClientR
     }
 
     @Override
+    public int removeByTenantIdAndDomainName(UUID tenantId, String domainName) {
+        return repository.deleteByTenantIdAndDomainName(tenantId, domainName);
+    }
+
+    @Override
     public int removeByTenantId(UUID tenantId) {
         return repository.deleteByTenantId(tenantId);
     }

@@ -26,5 +26,7 @@ public interface OAuth2ClientRegistrationRepository extends CrudRepository<OAuth
 
     List<OAuth2ClientRegistrationEntity> findAllByDomainName(String domainName);
 
+    int deleteByTenantIdAndDomainName(UUID tenantId, String domainName);
+
     int deleteByTenantId(UUID tenantId);
 }

@@ -215,6 +215,20 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
         Assert.assertEquals(0, oAuth2Service.findClientRegistrationsByTenantId(tenantId).size());
     }
 
+    @Test
+    public void testDeleteTenantDomainOAuth2ClientRegistrations() {
+        oAuth2Service.saveClientRegistration(validClientRegistration(tenantId, "domain1"));
+        oAuth2Service.saveClientRegistration(validClientRegistration(tenantId, "domain1"));
+        oAuth2Service.saveClientRegistration(validClientRegistration(tenantId, "domain2"));
+        oAuth2Service.saveClientRegistration(validClientRegistration(TenantId.SYS_TENANT_ID, "domain2"));
+        Assert.assertEquals(4, oAuth2Service.findAllClientRegistrations().size());
+        Assert.assertEquals(3, oAuth2Service.findClientRegistrationsByTenantId(tenantId).size());
+
+        oAuth2Service.deleteClientRegistrationsByDomain(tenantId, "domain1");
+        Assert.assertEquals(2, oAuth2Service.findAllClientRegistrations().size());
+        Assert.assertEquals(1, oAuth2Service.findClientRegistrationsByTenantId(tenantId).size());
+    }
+
     private void updateTenantAllowOAuth2Setting(Boolean allowOAuth2) throws IOException {
         Tenant tenant = tenantService.findTenantById(tenantId);
         if (allowOAuth2 == null) {