Merge branch 'master' of https://github.com/OsmSharp/osm-api-client into develop

Author: blackboxlogic

FunctionalTests/Tests.cs

@@ -49,7 +49,7 @@ public static class Tests
 			Visibility = Visibility.Public,
 		};
 
-		public static async Task TestClient(NonAuthClient client)
+		public static async Task TestClient(INonAuthClient client)
 		{
 			var capabilities = await client.GetCapabilities();
 			var apiVersion = await client.GetVersions();
@@ -110,7 +110,7 @@ public static async Task TestClient(NonAuthClient client)
 				newNote?.Status == Note.NoteStatus.Open);
 		}
 
-		public static async Task TestAuthClient(AuthClient client)
+		public static async Task TestAuthClient(IAuthClient client)
 		{
 			var permissions = await client.GetPermissions();
 			True(permissions?.UserPermission?.Any());

src/ClientsFactory.cs

@@ -21,19 +21,19 @@ public ClientsFactory(ILogger logger, HttpClient httpClient, string baseAddress)
         }
 
         /// <inheritdoc/>
-        public NonAuthClient CreateNonAuthClient()
+        public INonAuthClient CreateNonAuthClient()
         {
             return new NonAuthClient(_baseAddress, _httpClient, _logger);
         }
 
         /// <inheritdoc/>
-        public AuthClient CreateBasicAuthClient(string username, string password)
+        public IAuthClient CreateBasicAuthClient(string username, string password)
         {
             return new BasicAuthClient(_httpClient, _logger, _baseAddress, username, password);
         }
 
         /// <inheritdoc/>
-        public AuthClient CreateOAuthClient(string consumerKey, string consumerSecret, string token, string tokenSecret)
+        public IAuthClient CreateOAuthClient(string consumerKey, string consumerSecret, string token, string tokenSecret)
         {
             return new OAuthClient(_httpClient, _logger, _baseAddress, consumerKey, consumerSecret, token, tokenSecret);
         }

src/IAuthClient.cs

@@ -8,9 +8,9 @@
 namespace OsmSharp.IO.API
 {
     /// <summary>
-    /// Authenticationed OSM API Client
+    /// Authenticated OSM API Client
     /// </summary>
-    public interface IAuthClient
+    public interface IAuthClient : INonAuthClient
     {
         /// <summary>
         /// Create a Changeset, it is better to use <see cref="UploadChangeset(long, OsmChange)"/>

src/IClientsFactory.cs

@@ -10,14 +10,14 @@ public interface IClientsFactory
         /// Creates a client that does not need authentication and thus can't perform authenticated operations
         /// </summary>
         /// <returns></returns>
-        NonAuthClient CreateNonAuthClient();
+        INonAuthClient CreateNonAuthClient();
         /// <summary>
         /// Creates a client that needs user name and password credentials
         /// </summary>
         /// <param name="username"></param>
         /// <param name="password"></param>
         /// <returns></returns>
-        AuthClient CreateBasicAuthClient(string username, string password);
+        IAuthClient CreateBasicAuthClient(string username, string password);
         /// <summary>
         /// Creates a client that will use OAuth 1.0 credentials provided from the OAuth OSM page
         /// </summary>
@@ -26,6 +26,6 @@ public interface IClientsFactory
         /// <param name="token"></param>
         /// <param name="tokenSecret"></param>
         /// <returns></returns>
-        AuthClient CreateOAuthClient(string consumerKey, string consumerSecret, string token, string tokenSecret);
+        IAuthClient CreateOAuthClient(string consumerKey, string consumerSecret, string token, string tokenSecret);
     }
 }