scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-10-31 18:47:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-1529: CP: Open+Radius Captive Portal Auth doesn't work

Browse Source
This commit is contained in:
Mike Hansen
2021-04-06 11:38:59 -04:00
parent 052bad3ef2
commit eeeec8999f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -1011,11 +1011,12 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
ret.setHotspotConfig(hotspotConfig); ret.setHotspotConfig(hotspotConfig);
} }
ret.setRadiusProfiles(new ArrayList<>(radiusSet));
ret.setCaptiveProfiles(profileServiceInterface.get(captiveProfileIds)); ret.setCaptiveProfiles(profileServiceInterface.get(captiveProfileIds));
for (Profile captivePortal : ret.getCaptiveProfiles()) { for (Profile captivePortal : ret.getCaptiveProfiles()) {
radiusSet.addAll(profileContainer.getChildrenOfType(captivePortal.getId(), ProfileType.radius)); radiusSet.addAll(profileContainer.getChildrenOfType(captivePortal.getId(), ProfileType.radius));
} }
ret.setRadiusProfiles(new ArrayList<>(radiusSet));
ret.setBonjourGatewayProfiles(profileServiceInterface.get(bonjourGatewayProfileIds)); ret.setBonjourGatewayProfiles(profileServiceInterface.get(bonjourGatewayProfileIds));
List<Client> blockedClients = clientServiceInterface.getBlockedClients(customerId); List<Client> blockedClients = clientServiceInterface.getBlockedClients(customerId);
@@ -1023,7 +1024,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
if ((blockedClients != null) && !blockedClients.isEmpty()) { if ((blockedClients != null) && !blockedClients.isEmpty()) {
blockedClients.forEach(client -> blockList.add(client.getMacAddress())); blockedClients.forEach(client -> blockList.add(client.getMacAddress()));
} }
ret.setBlockedClients(blockList); ret.setBlockedClients(blockList);
ret.setRadiusProfiles(new ArrayList<>(radiusSet));
LOG.debug("ApConfig {}", ret); LOG.debug("ApConfig {}", ret);