API Client: added option for proxy port

Author: mgesing

src/Tools/SmartStore.WebApi.Client/App.config

@@ -40,6 +40,9 @@
             <setting name="FileUpload" serializeAs="String">
                 <value />
             </setting>
+            <setting name="ApiProxyPort" serializeAs="String">
+                <value />
+            </setting>
         </SmartStore.WebApi.Client.Properties.Settings>
 
 </userSettings>

src/Tools/SmartStore.WebApi.Client/MainForm.Designer.cs

@@ -30,6 +30,7 @@ public MainForm()
                 txtPublicKey.Text = s.ApiPublicKey;
                 txtSecretKey.Text = s.ApiSecretKey;
                 txtUrl.Text = s.ApiUrl;
+                txtProxyPort.Text = s.ApiProxyPort;
                 txtVersion.Text = s.ApiVersion;
                 cboPath.Items.FromString(s.ApiPaths);
                 cboQuery.Items.FromString(s.ApiQuery);
@@ -77,6 +78,7 @@ public MainForm()
                 s.ApiPublicKey = txtPublicKey.Text;
                 s.ApiSecretKey = txtSecretKey.Text;
                 s.ApiUrl = txtUrl.Text;
+                s.ApiProxyPort = txtProxyPort.Text;
                 s.ApiVersion = txtVersion.Text;
                 Settings.Default[radioOdata.Checked ? "ApiPaths" : "ApiPaths2"] = cboPath.Items.IntoString();
                 s.ApiQuery = cboQuery.Items.IntoString();
@@ -100,11 +102,14 @@ private void CallTheApi()
                 cboPath.Text = "/" + cboPath.Text;
             }
 
+            int.TryParse(txtProxyPort.Text, out var proxyPort);
+
             var context = new WebApiRequestContext
             {
                 PublicKey = txtPublicKey.Text,
                 SecretKey = txtSecretKey.Text,
                 Url = txtUrl.Text + (radioOdata.Checked ? "odata/" : "api/") + txtVersion.Text + cboPath.Text,
+                ProxyPort = proxyPort,
                 HttpMethod = cboMethod.Text,
                 HttpAcceptType = radioJson.Checked ? ApiConsumer.JsonAcceptType : ApiConsumer.XmlAcceptType,
                 AdditionalHeaders = cboHeaders.Text

src/Tools/SmartStore.WebApi.Client/MainForm.cs

@@ -5,8 +5,8 @@ namespace SmartStore.WebApi.Client
 {
     static class Program
     {
-        public static string AppName => "SmartStore Web API Client v.1.7";
-        public static string ConsumerName => "My shopping data consumer v.1.7";
+        public static string AppName => "SmartStore Web API Client v.1.8";
+        public static string ConsumerName => "My shopping data consumer v.1.8";
 
         [STAThread]
         static void Main()

src/Tools/SmartStore.WebApi.Client/Program.cs

@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SmartStoreWebApiClient")]
-[assembly: AssemblyCopyright("Copyright © SmartStore AG 2020")]
+[assembly: AssemblyCopyright("Copyright © SmartStore AG 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.0.0")]
-[assembly: AssemblyFileVersion("1.7.0.0")]
+[assembly: AssemblyVersion("1.8.0.0")]
+[assembly: AssemblyFileVersion("1.8.0.0")]

src/Tools/SmartStore.WebApi.Client/Properties/AssemblyInfo.cs

@@ -32,5 +32,8 @@
     <Setting Name="FileUpload" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="ApiProxyPort" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>

src/Tools/SmartStore.WebApi.Client/Properties/Settings.Designer.cs

@@ -343,6 +343,12 @@ public HttpWebRequest StartRequest(WebApiRequestContext context, string content,
                 request.Headers.Add(HttpRequestHeader.ContentMd5, contentMd5Hash);
             }
 
+            // API behind a reverse proxy?
+            if (context.ProxyPort > 0)
+            {
+                context.Url = new UriBuilder(context.Url) { Port = context.ProxyPort }.Uri.ToString();
+            }
+
             var messageRepresentation = CreateMessageRepresentation(context, contentMd5Hash, timestamp, true);
             //Debug.WriteLine(messageRepresentation);
             var signature = CreateSignature(context.SecretKey, messageRepresentation);

src/Tools/SmartStore.WebApi.Client/Properties/Settings.settings

@@ -8,22 +8,25 @@ public class WebApiRequestContext
         public string SecretKey { get; set; }
 
         public string Url { get; set; }
+        public int ProxyPort { get; set; }
         public string HttpMethod { get; set; }
         public string HttpAcceptType { get; set; }
         public string AdditionalHeaders { get; set; }
 
         public bool IsValid => !string.IsNullOrWhiteSpace(PublicKey) && !string.IsNullOrWhiteSpace(SecretKey) &&
                     !string.IsNullOrWhiteSpace(Url) &&
                     !string.IsNullOrWhiteSpace(HttpMethod) && !string.IsNullOrWhiteSpace(HttpAcceptType);
+
         public override string ToString()
         {
             var sb = new StringBuilder();
 
-            sb.AppendLine(string.Format("PublicKey: ", PublicKey));
-            sb.AppendLine(string.Format("SecretKey: ", SecretKey));
-            sb.AppendLine(string.Format("Url: ", Url));
-            sb.AppendLine(string.Format("HttpMethod: ", HttpMethod));
-            sb.AppendLine(string.Format("HttpAcceptType: ", HttpAcceptType));
+            sb.AppendLine("PublicKey: " + PublicKey);
+            sb.AppendLine("SecretKey: " + SecretKey);
+            sb.AppendLine("Url: " + Url);
+            sb.AppendLine("Proxy Port: " + (ProxyPort > 0 ? ProxyPort.ToString() : ""));
+            sb.AppendLine("HttpMethod: " + HttpMethod);
+            sb.AppendLine("HttpAcceptType: " + HttpAcceptType);
 
             return sb.ToString();
         }