Add ui part of oauth edge enabled. Add test

application/src/main/data/upgrade/3.6.3/schema_update.sql

@@ -0,0 +1,22 @@
+--
+-- Copyright © 2016-2024 The Thingsboard Authors
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- OAUTH2 PARAMS ALTER TABLE START
+
+ALTER TABLE oauth2_params
+    ADD COLUMN IF NOT EXISTS edge_enabled boolean DEFAULT false;
+
+-- OAUTH2 PARAMS ALTER TABLE END

application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java

@@ -127,6 +127,9 @@ public class ThingsboardInstallService {
                             log.info("Upgrading ThingsBoard from version 3.6.2 to 3.6.3 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.2");
                             systemDataLoaderService.updateDefaultNotificationConfigs();
+                        case "3.6.3":
+                            log.info("Upgrading ThingsBoard from version 3.6.3 to 3.6.4 ...");
+                            databaseEntitiesUpgradeService.upgradeDatabase("3.6.3");
                             //TODO DON'T FORGET to update switch statement in the CacheCleanupService if you need to clear the cache
                             break;
                         default:

application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java

@@ -165,6 +165,9 @@ public class EdgeEventSourcingListener {
             }
         } else if (entity instanceof AlarmApiCallResult || entity instanceof Alarm) {
             return false;
+        } else if (entity instanceof OAuth2Info) {
+            OAuth2Info oAuth2Info = (OAuth2Info) entity;
+            return oAuth2Info.isEdgeEnabled();
         }
         // Default: If the entity doesn't match any of the conditions, consider it as valid.
         return true;

application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerEdgeEventFetcher.java

@@ -46,7 +46,7 @@ public class CustomerEdgeEventFetcher implements EdgeEventFetcher {
         List<EdgeEvent> result = new ArrayList<>();
         result.add(EdgeUtils.constructEdgeEvent(edge.getTenantId(), edge.getId(),
                 EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, customerId, null));
-        // @voba - returns PageData object to be in sync with other fetchers
+        // returns PageData object to be in sync with other fetchers
         return new PageData<>(result, 1, result.size(), false);
     }
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EdgeEventFetcher.java

@@ -25,5 +25,5 @@ public interface EdgeEventFetcher {
 
     PageLink getPageLink(int pageSize);
 
-    PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) throws Exception;
+    PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink);
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java

@@ -29,25 +29,29 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.oauth2.OAuth2Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @AllArgsConstructor
 @Slf4j
-public class OAuth2EdgeEventFetcher extends BasePageableEdgeEventFetcher<OAuth2Info> {
+public class OAuth2EdgeEventFetcher implements EdgeEventFetcher {
 
     private final OAuth2Service oAuth2Service;
 
     @Override
-    PageData<OAuth2Info> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    public PageLink getPageLink(int pageSize) {
-        OAuth2Info result = oAuth2Service.findOAuth2Info();
+        return null;
-
-        // return PageData object to be in sync with other fetchers
-        return new PageData<>(List.of(result), 1, 1, false);
     }
 
     @Override
-    EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, OAuth2Info entity) {
+    public PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) {
-        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.OAUTH2,
+        List<EdgeEvent> result = new ArrayList<>();
-                EdgeEventActionType.ADDED, null, JacksonUtil.valueToTree(entity));
+        OAuth2Info oAuth2Info = oAuth2Service.findOAuth2Info();
+        if (oAuth2Info.isEdgeEnabled()) {
+            result.add(EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.OAUTH2,
+                    EdgeEventActionType.ADDED, null, JacksonUtil.valueToTree(oAuth2Info)));
+        }
+        // returns PageData object to be in sync with other fetchers
+        return new PageData<>(result, 1, result.size(), false);
     }
 }

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -115,6 +115,9 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
             case "3.6.2":
                 updateSchema("3.6.2", 3006002, "3.6.3", 3006003, null);
                 break;
+            case "3.6.3":
+                updateSchema("3.6.3", 3006003, "3.6.4", 3006004, null);
+                break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
         }

application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java

@@ -494,7 +494,7 @@ public class HomePageApiTest extends AbstractControllerTest {
     }
 
     private OAuth2Info createDefaultOAuth2Info() {
-        return new OAuth2Info(true, Lists.newArrayList(
+        return new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("domain").scheme(SchemeType.MIXED).build()

application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java

@@ -0,0 +1,110 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.edge;
+
+import com.google.common.collect.Lists;
+import com.google.protobuf.AbstractMessage;
+import org.junit.Assert;
+import org.junit.Test;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.oauth2.MapperType;
+import org.thingsboard.server.common.data.oauth2.OAuth2CustomMapperConfig;
+import org.thingsboard.server.common.data.oauth2.OAuth2DomainInfo;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
+import org.thingsboard.server.common.data.oauth2.OAuth2MapperConfig;
+import org.thingsboard.server.common.data.oauth2.OAuth2ParamsInfo;
+import org.thingsboard.server.common.data.oauth2.OAuth2RegistrationInfo;
+import org.thingsboard.server.common.data.oauth2.SchemeType;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.UUID;
+
+@DaoSqlTest
+public class OAuth2EdgeTest extends AbstractEdgeTest {
+
+    @Test
+    public void testOAuth2Support() throws Exception {
+        loginSysAdmin();
+
+        // enable oauth, verify nothing sent to edge
+        edgeImitator.expectMessageAmount(1);
+        OAuth2Info oAuth2Info = createDefaultOAuth2Info();
+        oAuth2Info = doPost("/api/oauth2/config", oAuth2Info, OAuth2Info.class);
+        Assert.assertFalse(edgeImitator.waitForMessages(10));
+
+        // enable edge support
+        edgeImitator.expectMessageAmount(1);
+        oAuth2Info.setEdgeEnabled(true);
+        oAuth2Info = doPost("/api/oauth2/config", oAuth2Info, OAuth2Info.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof OAuth2UpdateMsg);
+        OAuth2UpdateMsg oAuth2UpdateMsg = (OAuth2UpdateMsg) latestMessage;
+        OAuth2Info result = JacksonUtil.fromString(oAuth2UpdateMsg.getEntity(), OAuth2Info.class, true);
+        Assert.assertEquals(oAuth2Info, result);
+
+        // disable oauth suppor
+        oAuth2Info.setEnabled(false);
+        oAuth2Info.setEdgeEnabled(false);
+        doPost("/api/oauth2/config", oAuth2Info, OAuth2Info.class);
+
+        loginTenantAdmin();
+    }
+
+    private OAuth2Info createDefaultOAuth2Info() {
+        return new OAuth2Info(true, false, Lists.newArrayList(
+                OAuth2ParamsInfo.builder()
+                        .domainInfos(Lists.newArrayList(
+                                OAuth2DomainInfo.builder().name("domain").scheme(SchemeType.MIXED).build()
+                        ))
+                        .mobileInfos(Collections.emptyList())
+                        .clientRegistrations(Lists.newArrayList(
+                                validRegistrationInfo()
+                        ))
+                        .build()
+        ));
+    }
+
+    private OAuth2RegistrationInfo validRegistrationInfo() {
+        return OAuth2RegistrationInfo.builder()
+                .clientId(UUID.randomUUID().toString())
+                .clientSecret(UUID.randomUUID().toString())
+                .authorizationUri(UUID.randomUUID().toString())
+                .accessTokenUri(UUID.randomUUID().toString())
+                .scope(Arrays.asList(UUID.randomUUID().toString(), UUID.randomUUID().toString()))
+                .platforms(Collections.emptyList())
+                .userInfoUri(UUID.randomUUID().toString())
+                .userNameAttributeName(UUID.randomUUID().toString())
+                .jwkSetUri(UUID.randomUUID().toString())
+                .clientAuthenticationMethod(UUID.randomUUID().toString())
+                .loginButtonLabel(UUID.randomUUID().toString())
+                .mapperConfig(
+                        OAuth2MapperConfig.builder()
+                                .type(MapperType.CUSTOM)
+                                .custom(
+                                        OAuth2CustomMapperConfig.builder()
+                                                .url(UUID.randomUUID().toString())
+                                                .build()
+                                )
+                                .build()
+                )
+                .build();
+    }
+
+}

application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java

@@ -44,6 +44,7 @@ import org.thingsboard.server.gen.edge.v1.DownlinkResponseMsg;
 import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
 import org.thingsboard.server.gen.edge.v1.EntityDataProto;
 import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
 import org.thingsboard.server.gen.edge.v1.OtaPackageUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.QueueUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg;
@@ -314,6 +315,11 @@ public class EdgeImitator {
                 result.add(saveDownlinkMsg(resourceUpdateMsg));
             }
         }
+        if (downlinkMsg.getOAuth2UpdateMsgCount() > 0) {
+            for (OAuth2UpdateMsg oAuth2UpdateMsg : downlinkMsg.getOAuth2UpdateMsgList()) {
+                result.add(saveDownlinkMsg(oAuth2UpdateMsg));
+            }
+        }
         if (downlinkMsg.hasEdgeConfiguration()) {
             result.add(saveDownlinkMsg(downlinkMsg.getEdgeConfiguration()));
         }

common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java

@@ -36,6 +36,8 @@ import java.util.List;
 public class OAuth2Info {
     @ApiModelProperty("Whether OAuth2 settings are enabled or not")
     private boolean enabled;
+    @ApiModelProperty("Whether OAuth2 settings are enabled on Edge or not")
+    private boolean edgeEnabled;
     @ApiModelProperty(value = "List of configured OAuth2 clients. Cannot contain null values", required = true)
     private List<OAuth2ParamsInfo> oauth2ParamsInfos;
 }

common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Params.java

@@ -30,11 +30,13 @@ import org.thingsboard.server.common.data.id.TenantId;
 public class OAuth2Params extends BaseData<OAuth2ParamsId> {
 
     private boolean enabled;
+    private boolean edgeEnabled;
     private TenantId tenantId;
 
     public OAuth2Params(OAuth2Params oauth2Params) {
         super(oauth2Params);
         this.enabled = oauth2Params.enabled;
+        this.edgeEnabled = oauth2Params.edgeEnabled;
         this.tenantId = oauth2Params.tenantId;
     }
 }

dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java

@@ -427,6 +427,7 @@ public class ModelConstants {
      */
     public static final String OAUTH2_PARAMS_TABLE_NAME = "oauth2_params";
     public static final String OAUTH2_PARAMS_ENABLED_PROPERTY = "enabled";
+    public static final String OAUTH2_PARAMS_EDGE_ENABLED_PROPERTY = "edge_enabled";
     public static final String OAUTH2_PARAMS_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
 
     public static final String OAUTH2_REGISTRATION_TABLE_NAME = "oauth2_registration";

dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ParamsEntity.java

@@ -39,6 +39,9 @@ public class OAuth2ParamsEntity extends BaseSqlEntity<OAuth2Params> {
     @Column(name = ModelConstants.OAUTH2_PARAMS_ENABLED_PROPERTY)
     private Boolean enabled;
 
+    @Column(name = ModelConstants.OAUTH2_PARAMS_EDGE_ENABLED_PROPERTY)
+    private Boolean edgeEnabled;
+
     @Column(name = ModelConstants.OAUTH2_PARAMS_TENANT_ID_PROPERTY)
     private UUID tenantId;
 
@@ -48,6 +51,7 @@ public class OAuth2ParamsEntity extends BaseSqlEntity<OAuth2Params> {
         }
         this.setCreatedTime(oauth2Params.getCreatedTime());
         this.enabled = oauth2Params.isEnabled();
+        this.edgeEnabled = oauth2Params.isEdgeEnabled();
         if (oauth2Params.getTenantId() != null) {
             this.tenantId = oauth2Params.getTenantId().getId();
         }
@@ -60,6 +64,7 @@ public class OAuth2ParamsEntity extends BaseSqlEntity<OAuth2Params> {
         oauth2Params.setCreatedTime(createdTime);
         oauth2Params.setTenantId(TenantId.fromUUID(tenantId));
         oauth2Params.setEnabled(enabled);
+        oauth2Params.setEdgeEnabled(edgeEnabled);
         return oauth2Params;
     }
 }

dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java

@@ -127,6 +127,7 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
         OAuth2Info oauth2Info = new OAuth2Info();
         List<OAuth2Params> oauth2ParamsList = oauth2ParamsDao.find(TenantId.SYS_TENANT_ID);
         oauth2Info.setEnabled(oauth2ParamsList.stream().anyMatch(OAuth2Params::isEnabled));
+        oauth2Info.setEdgeEnabled(oauth2ParamsList.stream().anyMatch(OAuth2Params::isEdgeEnabled));
         List<OAuth2ParamsInfo> oauth2ParamsInfos = new ArrayList<>();
         oauth2Info.setOauth2ParamsInfos(oauth2ParamsInfos);
         oauth2ParamsList.stream().sorted(Comparator.comparing(BaseData::getUuidId)).forEach(oauth2Params -> {

dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java

@@ -88,6 +88,7 @@ public class OAuth2Utils {
     public static OAuth2Params infoToOAuth2Params(OAuth2Info oauth2Info) {
         OAuth2Params oauth2Params = new OAuth2Params();
         oauth2Params.setEnabled(oauth2Info.isEnabled());
+        oauth2Params.setEdgeEnabled(oauth2Info.isEdgeEnabled());
         oauth2Params.setTenantId(TenantId.SYS_TENANT_ID);
         return oauth2Params;
     }

dao/src/main/resources/sql/schema-entities.sql

@@ -560,6 +560,7 @@ CREATE TABLE IF NOT EXISTS ts_kv_dictionary
 CREATE TABLE IF NOT EXISTS oauth2_params (
     id uuid NOT NULL CONSTRAINT oauth2_params_pkey PRIMARY KEY,
     enabled boolean,
+    edge_enabled boolean,
     tenant_id uuid,
     created_time bigint NOT NULL
 );

dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java

@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
 
 @DaoSqlTest
 public class OAuth2ServiceTest extends AbstractServiceTest {
-    private static final OAuth2Info EMPTY_PARAMS = new OAuth2Info(false, Collections.emptyList());
+    private static final OAuth2Info EMPTY_PARAMS = new OAuth2Info(false, false, Collections.emptyList());
 
     @Autowired
     protected OAuth2Service oAuth2Service;
@@ -66,7 +66,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testSaveHttpAndMixedDomainsTogether() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -87,7 +87,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testSaveHttpsAndMixedDomainsTogether() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTPS).build(),
@@ -153,7 +153,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
         Assert.assertNotNull(foundOAuth2Info);
         Assert.assertEquals(oAuth2Info, foundOAuth2Info);
 
-        OAuth2Info newOAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info newOAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("another-domain").scheme(SchemeType.HTTPS).build()
@@ -194,7 +194,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
         List<OAuth2RegistrationInfo> thirdGroup = Lists.newArrayList(
                 validRegistrationInfo()
         );
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -318,7 +318,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
                 validRegistrationInfo(),
                 validRegistrationInfo()
         );
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -363,7 +363,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testGetDisabledOAuth2Clients() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -402,7 +402,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindAllRegistrations() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -451,7 +451,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindRegistrationById() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -495,7 +495,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindAppSecret() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -547,7 +547,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindClientsByPackageAndPlatform() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -596,7 +596,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
     }
 
     private OAuth2Info createDefaultOAuth2Info() {
-        return new OAuth2Info(true, Lists.newArrayList(
+        return new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -664,4 +664,5 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
                 .appSecret(appSecret != null ? appSecret : StringUtils.randomAlphanumeric(24))
                 .build();
     }
+
 }

ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html

@@ -29,10 +29,13 @@
     <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
     <mat-card-content style="padding-top: 16px;">
       <form [formGroup]="oauth2SettingsForm" (ngSubmit)="save()">
-        <fieldset [disabled]="isLoading$ | async">
+        <fieldset class="fields-group tb-margin" [disabled]="isLoading$ | async">
           <mat-checkbox formControlName="enabled">
             {{ 'admin.oauth2.enable' | translate }}
           </mat-checkbox>
+          <mat-checkbox formControlName="edgeEnabled">
+            {{ 'admin.oauth2.edge-enable' | translate }}
+          </mat-checkbox>
           <section *ngIf="oauth2SettingsForm.get('enabled').value" style="margin-top: 1em;">
             <ng-container formArrayName="oauth2ParamsInfos">
               <div class="container">

ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts

@@ -204,7 +204,8 @@ export class OAuth2SettingsComponent extends PageComponent implements OnInit, Ha
   private buildOAuth2SettingsForm(): void {
     this.oauth2SettingsForm = this.fb.group({
       oauth2ParamsInfos: this.fb.array([]),
-      enabled: [false]
+      enabled: [false],
+      edgeEnabled: [false]
     });
   }
 

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -283,6 +283,7 @@
           "domain-schema-https": "HTTPS",
           "domain-schema-mixed": "HTTP+HTTPS",
           "enable": "Enable OAuth2 settings",
+          "edge-enable": "Propagate OAuth2 setting to Edge",
           "domains": "Domains",
           "mobile-apps": "Mobile applications",
           "no-mobile-apps": "No applications configured",