From eeeec8999faa4c621d39c4357d16848838f90f5c Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Tue, 6 Apr 2021 11:38:59 -0400 Subject: [PATCH] WIFI-1529: CP: Open+Radius Captive Portal Auth doesn't work --- .../integration/OpensyncExternalIntegrationCloud.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index 0d96a50..0bbc512 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -1011,11 +1011,12 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra ret.setHotspotConfig(hotspotConfig); } - ret.setRadiusProfiles(new ArrayList<>(radiusSet)); ret.setCaptiveProfiles(profileServiceInterface.get(captiveProfileIds)); for (Profile captivePortal : ret.getCaptiveProfiles()) { radiusSet.addAll(profileContainer.getChildrenOfType(captivePortal.getId(), ProfileType.radius)); } + ret.setRadiusProfiles(new ArrayList<>(radiusSet)); + ret.setBonjourGatewayProfiles(profileServiceInterface.get(bonjourGatewayProfileIds)); List blockedClients = clientServiceInterface.getBlockedClients(customerId); @@ -1023,7 +1024,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra if ((blockedClients != null) && !blockedClients.isEmpty()) { blockedClients.forEach(client -> blockList.add(client.getMacAddress())); } + ret.setBlockedClients(blockList); + ret.setRadiusProfiles(new ArrayList<>(radiusSet)); LOG.debug("ApConfig {}", ret);