From 86aacc07ae70206c55083c3d2293f350d60de792 Mon Sep 17 00:00:00 2001
From: vzikratyi <vzikratyi@thingsboard.io>
Date: Mon, 21 Sep 2020 13:40:24 +0300
Subject: [PATCH] Set default value to 'false' for 'isOAuth2ConfigAllowed'

---
 .../org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java    | 2 +-
 .../thingsboard/server/dao/service/BaseOAuth2ServiceTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 70b0f1edfd..788c1293da 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
@@ -129,7 +129,7 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
         if (tenant == null) return false;
         JsonNode allowOAuth2ConfigurationJsonNode = tenant.getAdditionalInfo() != null ? tenant.getAdditionalInfo().get(ALLOW_OAUTH2_CONFIGURATION) : null;
         if (allowOAuth2ConfigurationJsonNode == null) {
-            return true;
+            return false;
         } else {
             return allowOAuth2ConfigurationJsonNode.asBoolean();
         }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
index 975b6f318b..2231bc6dfe 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
@@ -66,7 +66,7 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
     @Test
     public void testIsOAuth2Allowed_null() throws IOException {
         updateTenantAllowOAuth2Setting(null);
-        Assert.assertTrue(oAuth2Service.isOAuth2ClientRegistrationAllowed(tenantId));
+        Assert.assertFalse(oAuth2Service.isOAuth2ClientRegistrationAllowed(tenantId));
     }
 
     @Test