Merge branch 'feature/dynamic-oauth2-new-table' of https://github.com/vzikratyi-…

…tb/thingsboard into feature/dynamic-oauth2-new-table

@@ -129,7 +129,7 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
         if (tenant == null) return false;
         if (tenant == null) return false;
         JsonNode allowOAuth2ConfigurationJsonNode = tenant.getAdditionalInfo() != null ? tenant.getAdditionalInfo().get(ALLOW_OAUTH2_CONFIGURATION) : null;
         JsonNode allowOAuth2ConfigurationJsonNode = tenant.getAdditionalInfo() != null ? tenant.getAdditionalInfo().get(ALLOW_OAUTH2_CONFIGURATION) : null;
         if (allowOAuth2ConfigurationJsonNode == null) {
         if (allowOAuth2ConfigurationJsonNode == null) {
-            return true;
+            return false;
         } else {
         } else {
             return allowOAuth2ConfigurationJsonNode.asBoolean();
             return allowOAuth2ConfigurationJsonNode.asBoolean();
         }
         }

@@ -66,7 +66,7 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
     @Test
     @Test
     public void testIsOAuth2Allowed_null() throws IOException {
     public void testIsOAuth2Allowed_null() throws IOException {
         updateTenantAllowOAuth2Setting(null);
         updateTenantAllowOAuth2Setting(null);
-        Assert.assertTrue(oAuth2Service.isOAuth2ClientRegistrationAllowed(tenantId));
+        Assert.assertFalse(oAuth2Service.isOAuth2ClientRegistrationAllowed(tenantId));
     }
     }
 
 
     @Test
     @Test