scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-04 04:27:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-835: Captive Portal: User List Authentication feature does not work unless user list is pushed to cloud manually.

Browse Source 
avoid adding https:// to externalFilestoreURL.
This commit is contained in:
Mike Hansen
2021-03-05 17:29:46 -05:00
parent 8510882ed8
commit ff8b0a006c
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java
View File

@@ -686,20 +686,15 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
mfi.setFileType(FileType.TEXT); mfi.setFileType(FileType.TEXT);
mfi.setApExportUrl(userFilepath.getFileName().toString()); mfi.setApExportUrl(userFilepath.getFileName().toString());
captiveMap captiveMap
.put("username_password_file", .put("username_password_file", externalFileStoreURL + mfi.getApExportUrl());
ManagedFileInfo.resolveWithPopulatedHostname(
mfi, externalFileStoreURL)
.getApExportUrl());
} }
if (captiveProfileDetails.getLogoFile() != null) { if (captiveProfileDetails.getLogoFile() != null) {
captiveMap.put("splash_page_logo", ManagedFileInfo captiveMap.put("splash_page_logo", externalFileStoreURL +
.resolveWithPopulatedHostname(captiveProfileDetails.getLogoFile(), externalFileStoreURL) captiveProfileDetails.getLogoFile().getApExportUrl());
.getApExportUrl());
} }
if (captiveProfileDetails.getBackgroundFile() != null) { if (captiveProfileDetails.getBackgroundFile() != null) {
captiveMap.put("splash_page_background_logo", captiveMap.put("splash_page_background_logo",
ManagedFileInfo.resolveWithPopulatedHostname(captiveProfileDetails.getBackgroundFile(), externalFileStoreURL + captiveProfileDetails.getBackgroundFile().getApExportUrl());
externalFileStoreURL).getApExportUrl());
} }
LOG.debug("captiveMap {}", captiveMap); LOG.debug("captiveMap {}", captiveMap);
walledGardenAllowlist.addAll(captiveProfileDetails.getWalledGardenAllowlist()); walledGardenAllowlist.addAll(captiveProfileDetails.getWalledGardenAllowlist());