Auth gets reported in the logs using the child class name.

Fix typo 'your'

Author: blackboxlogic

FunctionalTests/Program.cs

@@ -31,7 +31,7 @@ public static void Main()
 				// Test BasicAuth
 				if (!string.IsNullOrEmpty(Config["basicAuth:Password"]))
 				{
-					if (!Config["osmApiUrl"].Contains("dev")) throw new Exception("These tests modify data, and it looks like your running them in PROD, please don't");
+					if (!Config["osmApiUrl"].Contains("dev")) throw new Exception("These tests modify data, and it looks like you're running them in PROD, please don't");
 
 					testsLogger.LogInformation("Testing BasicAuth client");
 					var basicAuth = clientFactory.CreateBasicAuthClient(Config["basicAuth:User"], Config["basicAuth:Password"]);

src/BasicAuthClient.cs

@@ -5,30 +5,29 @@
 
 namespace OsmSharp.IO.API
 {
-	/// <summary>
-	/// Use of basic auth is discouraged. Use OAuth when practical.
-	/// </summary>
-	public class BasicAuthClient : AuthClient
-	{
-		private readonly string Username;
-		private readonly string Password;
+    /// <summary>
+    /// Use of basic auth is discouraged. Use OAuth when practical.
+    /// </summary>
+    public class BasicAuthClient : AuthClient
+    {
+        private readonly string Username;
+        private readonly string Password;
 
-		public BasicAuthClient(HttpClient httpClient,
+        public BasicAuthClient(HttpClient httpClient,
             ILogger logger,
             string baseAddress, 
             string username, 
             string password)
-			: base (baseAddress, httpClient, logger)
-		{
-			Username = username;
-			Password = password;
-		}
+            : base (baseAddress, httpClient, logger)
+        {
+            Username = username;
+            Password = password;
+        }
 
-		protected override string AddAuthentication(HttpRequestMessage request, string url, string method = "GET")
-		{
-			var auth = Convert.ToBase64String(Encoding.ASCII.GetBytes(Username + ":" + Password));
+        protected override void AddAuthentication(HttpRequestMessage request, string url, string method = "GET")
+        {
+            var auth = Convert.ToBase64String(Encoding.ASCII.GetBytes(Username + ":" + Password));
             request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", auth);
-            return "Basic authentication";
-		}
-	}
+        }
+    }
 }

src/NonAuthClient.cs

@@ -659,7 +659,7 @@ public async Task<Note> CreateNote(double latitude, double longitude, string tex
         }
         #endregion
 
-        protected async Task<IEnumerable<T>> GetOfType<T>(string address, Func<HttpRequestMessage, string> auth = null) where T : class
+        protected async Task<IEnumerable<T>> GetOfType<T>(string address, Action<HttpRequestMessage> auth = null) where T : class
         {
             var content = await Get(address, auth);
             var streamSource = new XmlOsmStreamSource(await content.ReadAsStreamAsync());
@@ -694,7 +694,7 @@ protected string ToString(double number)
         #region Http
         protected static readonly Func<string, string> Encode = HttpUtility.UrlEncode;
 
-        protected async Task<T> Get<T>(string address, Func<HttpRequestMessage, string> auth = null) where T : class
+        protected async Task<T> Get<T>(string address, Action<HttpRequestMessage> auth = null) where T : class
         {
             var content = await Get(address, auth);
             var stream = await content.ReadAsStreamAsync();
@@ -703,13 +703,13 @@ protected async Task<T> Get<T>(string address, Func<HttpRequestMessage, string>
             return element;
         }
 
-        protected async Task<HttpContent> Get(string address, Func<HttpRequestMessage, string> auth = null)
+        protected async Task<HttpContent> Get(string address, Action<HttpRequestMessage> auth = null)
         {
             using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, address))
             {
-                var authString = auth?.Invoke(request);
+                auth?.Invoke(request);
                 var response = await _httpClient.SendAsync(request);
-                await VerifyAndLogReponse(response, $"GET: {address} {authString}");
+                await VerifyAndLogReponse(response, $"{GetType().Name} GET: {address}");
                 return response.Content;
             }
         }
@@ -738,16 +738,16 @@ protected async Task<T> Put<T>(string address, HttpContent requestContent = null
         /// <param name="message"></param>
         /// <param name="url"></param>
         /// <param name="method"></param>
-        protected virtual string AddAuthentication(HttpRequestMessage message, string url, string method = "GET") { return "No authentication"; }
+        protected virtual void AddAuthentication(HttpRequestMessage message, string url, string method = "GET") { }
 
         protected async Task<HttpContent> SendAuthRequest(HttpMethod method, string address, HttpContent requestContent)
         {
             using (HttpRequestMessage request = new HttpRequestMessage(method, address))
             {
-                var authString = AddAuthentication(request, address, method.ToString());
+                AddAuthentication(request, address, method.ToString());
                 request.Content = requestContent;
                 var response = await _httpClient.SendAsync(request);
-                await VerifyAndLogReponse(response, $"{method}: {address} {authString}");
+                await VerifyAndLogReponse(response, $"{GetType().Name} {method}: {address}");
                 return response.Content;
             }
         }

src/OAuthClient.cs

@@ -4,51 +4,50 @@
 
 namespace OsmSharp.IO.API
 {
-	public class OAuthClient : AuthClient
-	{
-		/// <summary>
-		/// The OSM consumer key that was generated from OSM site
-		/// </summary>
-		private readonly string ConsumerKey;
-		/// <summary>
-		/// The OSM consumer secret that was generated from OSM site
-		/// </summary>
-		private readonly string ConsumerSecret;
-		private readonly string Token;
-		private readonly string TokenSecret;
+    public class OAuthClient : AuthClient
+    {
+        /// <summary>
+        /// The OSM consumer key that was generated from OSM site
+        /// </summary>
+        private readonly string ConsumerKey;
+        /// <summary>
+        /// The OSM consumer secret that was generated from OSM site
+        /// </summary>
+        private readonly string ConsumerSecret;
+        private readonly string Token;
+        private readonly string TokenSecret;
 
-		public OAuthClient(HttpClient httpClient,
+        public OAuthClient(HttpClient httpClient,
             ILogger logger,
             string baseAddress,
             string consumerKey, 
             string consumerSecret, 
             string token, 
             string tokenSecret)
-			: base (baseAddress, httpClient, logger)
-		{
-			ConsumerKey = consumerKey;
-			ConsumerSecret = consumerSecret;
-			Token = token;
-			TokenSecret = tokenSecret;
-		}
+            : base (baseAddress, httpClient, logger)
+        {
+            ConsumerKey = consumerKey;
+            ConsumerSecret = consumerSecret;
+            Token = token;
+            TokenSecret = tokenSecret;
+        }
 
-		protected override string AddAuthentication(HttpRequestMessage message, string url, string method = "GET")
-		{
-			var request = new OAuth.OAuthRequest
-			{
-				ConsumerKey = ConsumerKey,
-				ConsumerSecret = ConsumerSecret,
-				Token = Token,
-				TokenSecret = TokenSecret,
-				Type = OAuth.OAuthRequestType.ProtectedResource,
-				SignatureMethod = OAuth.OAuthSignatureMethod.HmacSha1,
-				RequestUrl = url,
-				Version = "1.0",
-				Method = method
-			};
-			var auth = request.GetAuthorizationHeader().Replace("OAuth ", "");
+        protected override void AddAuthentication(HttpRequestMessage message, string url, string method = "GET")
+        {
+            var request = new OAuth.OAuthRequest
+            {
+                ConsumerKey = ConsumerKey,
+                ConsumerSecret = ConsumerSecret,
+                Token = Token,
+                TokenSecret = TokenSecret,
+                Type = OAuth.OAuthRequestType.ProtectedResource,
+                SignatureMethod = OAuth.OAuthSignatureMethod.HmacSha1,
+                RequestUrl = url,
+                Version = "1.0",
+                Method = method
+            };
+            var auth = request.GetAuthorizationHeader().Replace("OAuth ", "");
             message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("OAuth", auth);
-            return "OAuth authentication";
-		}
-	}
+        }
+    }
 }