feat: allow /v1 or /v2 prefixes in path

Signed-off-by: Adrien Barreau <[email protected]>

Author: deathiop

csharp-ovh/Client/Client.cs

@@ -238,6 +238,22 @@ public static string GenerateSignature(string applicationSecret, string consumer
             return $"$1${signature}";
         }
 
+        private string GetTarget(string path)
+        {
+            if (path.StartsWith("/"))
+            {
+                path = path.Substring(1);
+            }
+
+            var endpoint = Endpoint.ToString();
+            if (endpoint.EndsWith("/1.0/") && (path.StartsWith("v1/") || path.StartsWith("v2/")))
+            {
+                endpoint = endpoint.Substring(0, endpoint.Length - 4);
+            }
+
+            return new Uri(endpoint) + path;
+        }
+
         private async Task SetHeaders(HttpRequestMessage msg, string method, string target, string data, bool needAuth, bool isBatch = false)
         {
             var headers = msg.Headers;
@@ -317,23 +333,19 @@ public async Task<long> GetTimeDelta()
         /// <exception cref="InvalidResponseException">when API response could not be decoded</exception>
         private async Task<string> CallAsync(string method, string path, string data = null, bool needAuth = true, bool isBatch = false, TimeSpan? timeout = null)
         {
-            if (path.StartsWith("/"))
-            {
-                path = path.Substring(1);
-            }
-
             HttpResponseMessage response = null;
 
             try
             {
                 var httpMethod = new HttpMethod(method);
-                HttpRequestMessage msg = new HttpRequestMessage(httpMethod, new Uri(Endpoint + path));
+                var target = GetTarget(path);
+                HttpRequestMessage msg = new HttpRequestMessage(httpMethod, target);
                 if (httpMethod != HttpMethod.Get && data != null)
                 {
                     msg.Content = new StringContent(data ?? "", Encoding.UTF8, "application/json");
                 }
 
-                await SetHeaders(msg, method, Endpoint + path, data, needAuth, isBatch).ConfigureAwait(false);
+                await SetHeaders(msg, method, target.ToString(), data, needAuth, isBatch).ConfigureAwait(false);
 
                 using (var cts = new CancellationTokenSource(timeout ?? _defaultTimeout))
                 {

csharp-ovh/csharp-ovh.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>csharp-ovh</AssemblyName>
     <Title>OVH C# API Wrapper</Title>
     <PackageVersion>4.0.5</PackageVersion>

test/GetRequests.cs

@@ -45,7 +45,10 @@ public async Task GET_auth_time()
         }
 
         [Test]
-        public async Task GET_me_as_string()
+	[TestCase("/me", "https://eu.api.ovh.com/1.0/me", "$1$dfe0b86bf2ab0d9eb3f785dc1ab00de58984d80c")]
+	[TestCase("/v1/me", "https://eu.api.ovh.com/v1/me", "$1$b6849b8a25d6bc46c6ad1dfb0fc67d07db9553a3")]
+	[TestCase("/v2/me", "https://eu.api.ovh.com/v2/me", "$1$291bb7bdbef11b1050200a109a4fe5109ed96cdd")]
+        public async Task GET_me_as_string(string call, string called, string sig)
         {
             var fake = A.Fake<FakeHttpMessageHandler>(a => a.CallsBaseMethods());
             MockAuthTimeCallWithFakeItEasy(fake);
@@ -57,20 +60,25 @@ public async Task GET_me_as_string()
 
 
             var c = ClientFactory.GetClient(fake);
-            var result = await c.GetAsync("/me");
+
+            var result = await c.GetAsync(call);
             Assert.AreEqual(Responses.Get.me_content, result);
 
             var meCall = Fake.GetCalls(fake).Where(call =>
                 call.Method.Name == "Send" &&
                 call.GetArgument<HttpRequestMessage>("request").RequestUri.ToString().Contains("/me")).First();
 
             var requestMessage = meCall.GetArgument<HttpRequestMessage>("request");
+
+	    var uri = requestMessage.RequestUri;
+	    Assert.AreEqual(called, uri.AbsoluteUri);
+
             var headers = requestMessage.Headers;
             Assert.Multiple(() => {
                 Assert.AreEqual(Constants.APPLICATION_KEY, headers.GetValues(Client.OVH_APP_HEADER).First());
                 Assert.AreEqual(Constants.CONSUMER_KEY, headers.GetValues(Client.OVH_CONSUMER_HEADER).First());
                 Assert.AreEqual(currentServerTimestamp.ToString(), headers.GetValues(Client.OVH_TIME_HEADER).First());
-                Assert.AreEqual("$1$dfe0b86bf2ab0d9eb3f785dc1ab00de58984d80c", headers.GetValues(Client.OVH_SIGNATURE_HEADER).First());
+                Assert.AreEqual(sig, headers.GetValues(Client.OVH_SIGNATURE_HEADER).First());
             });
         }
 

test/test.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="5.1.1" />
@@ -12,4 +12,4 @@
   <ItemGroup>
     <ProjectReference Include="..\csharp-ovh\csharp-ovh.csproj" />
   </ItemGroup>
-</Project>
+</Project>