Updated IAuthentication interface to support more types of Authentica…

…tion.
zzwwg · Aug 24, 2020 · cdcbc2d · cdcbc2d
1 parent e0480e2
commit cdcbc2d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/AutoUpdater.NET/AutoUpdater.cs b/AutoUpdater.NET/AutoUpdater.cs
@@ -674,10 +674,7 @@ internal static MyWebClient GetWebClient(Uri uri, IAuthentication basicAuthentic
             }
             else
             {
-                if (basicAuthentication != null)
-                {
-                    webClient.Headers[HttpRequestHeader.Authorization] = basicAuthentication.ToString();
-                }
+                basicAuthentication?.Apply(ref webClient);
 
                 webClient.Headers[HttpRequestHeader.UserAgent] = HttpUserAgent;
             }

diff --git a/AutoUpdater.NET/BasicAuthentication.cs b/AutoUpdater.NET/BasicAuthentication.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Text;
 
 namespace AutoUpdaterDotNET
@@ -13,7 +14,7 @@ public class BasicAuthentication : IAuthentication
         private string Password { get; }
 
         /// <summary>
-        /// Initializes credentials for Basic Authentication.
+        ///     Initializes credentials for Basic Authentication.
         /// </summary>
         /// <param name="username">Username to use for Basic Authentication</param>
         /// <param name="password">Password to use for Basic Authentication</param>
@@ -29,5 +30,11 @@ public override string ToString()
             var token = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{Username}:{Password}"));
             return $"Basic {token}";
         }
+
+        /// <inheritdoc />
+        public void Apply(ref MyWebClient webClient)
+        {
+            webClient.Headers[HttpRequestHeader.Authorization] = ToString();
+        }
     }
 }
diff --git a/AutoUpdater.NET/CustomAuthentication.cs b/AutoUpdater.NET/CustomAuthentication.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net;
 
 namespace AutoUpdaterDotNET
 {
@@ -12,18 +10,24 @@ public class CustomAuthentication : IAuthentication
         private string HttpRequestHeaderAuthorizationValue { get; }
 
         /// <summary>
-        /// Initializes authorization header value for Custom Authentication
+        ///     Initializes authorization header value for Custom Authentication
         /// </summary>
         /// <param name="httpRequestHeaderAuthorizationValue">Value to use as http request header authorization value</param>
         public CustomAuthentication(string httpRequestHeaderAuthorizationValue)
         {
             HttpRequestHeaderAuthorizationValue = httpRequestHeaderAuthorizationValue;
         }
-
+        
         /// <inheritdoc />
         public override string ToString()
         {
             return HttpRequestHeaderAuthorizationValue;
         }
+
+        /// <inheritdoc />
+        public void Apply(ref MyWebClient webClient)
+        {
+            webClient.Headers[HttpRequestHeader.Authorization] = ToString();
+        }
     }
 }
diff --git a/AutoUpdater.NET/IAuthentication.cs b/AutoUpdater.NET/IAuthentication.cs
@@ -6,5 +6,10 @@
     /// </summary>
     public interface IAuthentication
     {
+        /// <summary>
+        ///     Apply the authentication to webclient.
+        /// </summary>
+        /// <param name="webClient">WebClient for which you want to use this authentication method.</param>
+        void Apply(ref MyWebClient webClient);
     }
 }