From ff8b0a006cc6d1d46598b650e3b92c19efc81c21 Mon Sep 17 00:00:00 2001
From: Mike Hansen <mike.hansen@connectus.ai>
Date: Fri, 5 Mar 2021 17:29:46 -0500
Subject: [PATCH] WIFI-835: Captive Portal: User List Authentication feature
 does not work unless user list is pushed to cloud manually.

avoid adding https:// to externalFilestoreURL.
---
 .../wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java
index 5711d1e..89d4a4f 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java
@@ -686,20 +686,15 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                         mfi.setFileType(FileType.TEXT);
                         mfi.setApExportUrl(userFilepath.getFileName().toString());
                         captiveMap
-                                .put("username_password_file",
-                                        ManagedFileInfo.resolveWithPopulatedHostname(
-                                               mfi, externalFileStoreURL)
-                                                .getApExportUrl());
+                                .put("username_password_file", externalFileStoreURL + mfi.getApExportUrl());
                     }
                     if (captiveProfileDetails.getLogoFile() != null) {
-                        captiveMap.put("splash_page_logo", ManagedFileInfo
-                                .resolveWithPopulatedHostname(captiveProfileDetails.getLogoFile(), externalFileStoreURL)
-                                .getApExportUrl());
+                        captiveMap.put("splash_page_logo", externalFileStoreURL +
+                                captiveProfileDetails.getLogoFile().getApExportUrl());
                     }
                     if (captiveProfileDetails.getBackgroundFile() != null) {
                         captiveMap.put("splash_page_background_logo",
-                                ManagedFileInfo.resolveWithPopulatedHostname(captiveProfileDetails.getBackgroundFile(),
-                                        externalFileStoreURL).getApExportUrl());
+                                externalFileStoreURL + captiveProfileDetails.getBackgroundFile().getApExportUrl());
                     }
                     LOG.debug("captiveMap {}", captiveMap);
                     walledGardenAllowlist.addAll(captiveProfileDetails.getWalledGardenAllowlist());