From b70bf310b1fdc1bd23ce83f1abdc2e97570519bd Mon Sep 17 00:00:00 2001
From: Andrei Anischevici <anischev@adobe.com>
Date: Thu, 28 Oct 2021 00:20:48 +0300
Subject: [PATCH] Fix TNT-42553 ODD artifact still downloaded via HTTPS when
 Secure=false (#29)

---
 Source/Adobe.Target.Client/OnDevice/GeoClient.cs  | 3 +--
 Source/Adobe.Target.Client/OnDevice/RuleLoader.cs | 2 +-
 Source/Adobe.Target.Client/TargetClientConfig.cs  | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Source/Adobe.Target.Client/OnDevice/GeoClient.cs b/Source/Adobe.Target.Client/OnDevice/GeoClient.cs
index 799195b..8e59507 100644
--- a/Source/Adobe.Target.Client/OnDevice/GeoClient.cs
+++ b/Source/Adobe.Target.Client/OnDevice/GeoClient.cs
@@ -10,7 +10,6 @@
  */
 namespace Adobe.Target.Client.OnDevice
 {
-    using System;
     using System.Threading.Tasks;
     using Adobe.Target.Delivery.Model;
     using RestSharp;
@@ -90,7 +89,7 @@ private Geo HeadersToGeo(Geo originalGeo, IRestResponse response)
 
         private string GetGeoUrl(TargetClientConfig clientConfig)
         {
-            return Uri.UriSchemeHttps + "://" + clientConfig.OnDeviceConfigHostname + GeoPath;
+            return clientConfig.Protocol + clientConfig.OnDeviceConfigHostname + GeoPath;
         }
     }
 }
diff --git a/Source/Adobe.Target.Client/OnDevice/RuleLoader.cs b/Source/Adobe.Target.Client/OnDevice/RuleLoader.cs
index 34e4264..a808306 100644
--- a/Source/Adobe.Target.Client/OnDevice/RuleLoader.cs
+++ b/Source/Adobe.Target.Client/OnDevice/RuleLoader.cs
@@ -134,7 +134,7 @@ private async Task LoadRulesAsync()
                 return;
             }
 
-            RestClient client = new (Uri.UriSchemeHttps + "://" + this.clientConfig.OnDeviceConfigHostname);
+            RestClient client = new (this.clientConfig.Protocol + this.clientConfig.OnDeviceConfigHostname);
 
             client.ClearHandlers();
             client.AddDefaultHeader(AcceptHeader, AcceptHeaderValue);
diff --git a/Source/Adobe.Target.Client/TargetClientConfig.cs b/Source/Adobe.Target.Client/TargetClientConfig.cs
index ec9c598..b952be8 100644
--- a/Source/Adobe.Target.Client/TargetClientConfig.cs
+++ b/Source/Adobe.Target.Client/TargetClientConfig.cs
@@ -26,8 +26,6 @@ public sealed class TargetClientConfig
     {
         private const string ClusterPrefix = "mboxedge";
         private const string DefaultDomain = "tt.omtrdc.net";
-        private const string Https = "https://";
-        private const string Http = "http://";
 
         private TargetClientConfig()
         {
@@ -38,7 +36,7 @@ private TargetClientConfig(Builder builder)
             ValidateConfig(builder);
             this.Client = builder.Client;
             this.OrganizationId = builder.OrganizationId;
-            this.Protocol = builder.Secure ? Https : Http;
+            this.Protocol = $"{(builder.Secure ? Uri.UriSchemeHttps : Uri.UriSchemeHttp)}{Uri.SchemeDelimiter}";
             this.DefaultPropertyToken = builder.DefaultPropertyToken;
             this.DefaultUrl = builder.ServerDomain != DefaultDomain
                 ? $"{this.Protocol}{builder.ServerDomain}"