Merge pull request #410 from microsoftgraph/po/queryOptionFix

Remove leading ? from query option on PS 5.1.

Author: peombwa

.azure-pipelines/generate-auth-module-template.yml

@@ -61,8 +61,7 @@ jobs:
   - task: CodeMetrics@1
     displayName: 'Run CodeMetrics'
     inputs:
-        Files: '$(System.DefaultWorkingDirectory)//**//*Microsoft.Graph*.dll;$(System.DefaultWorkingDirectory)//**//*Microsoft.Graph*.exe'
-        file: '$(System.DefaultWorkingDirectory)//**//*Microsoft.Graph*.dll;$(System.DefaultWorkingDirectory)//**//*Microsoft.Graph*.exe'
+        Files: '$(System.DefaultWorkingDirectory)//**//Microsoft.Graph.Authentication.dll;$(System.DefaultWorkingDirectory)//**//Microsoft.Graph.Authentication.exe'
         continueOnError: true
 
   - task: PowerShell@2

src/Authentication/Authentication.Test/Helpers/AuthenticationHelpersTests.cs

@@ -66,6 +66,7 @@ public void ShouldUseDeviceCodeProviderWhenDelegatedContextIsProvided()
             GraphSession.Reset();
         }
 
+#if NETCORE
         [Fact]
         public void ShouldUseClientCredentialProviderWhenAppOnlyContextIsProvided()
         {
@@ -133,6 +134,7 @@ private void DeleteSelfSignedCert(string certificateName)
                 xStore.Remove(xCertificate);
             }
         }
+#endif
 
     }
 }

src/Authentication/Authentication.Test/Helpers/ODataQueryOptionsHandlerTests.cs

@@ -2,6 +2,7 @@ namespace Microsoft.Graph.Authentication.Test
 {
     using Microsoft.Graph.PowerShell.Authentication.Helpers;
     using System;
+    using System.Linq;
     using System.Net.Http;
     using System.Threading;
     using System.Threading.Tasks;
@@ -51,6 +52,7 @@ public async Task ShouldAddDollarSignToStandardODataQueryOptionsToV1Endpoint()
             Assert.Contains($"${filterParam}", sentRequestQuery);
             Assert.Contains($"${expandParam}", sentRequestQuery);
             Assert.Equal(5, sentRequestQuery.Split('&').Length);
+            Assert.Equal(1, response.RequestMessage.RequestUri.AbsoluteUri.Count(u => (u == '?')));
         }
 
         [Fact]

src/Authentication/Authentication.Test/Microsoft.Graph.Authentication.Test.csproj

@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="xunit" Version="2.4.0" />

src/Authentication/Authentication/Helpers/ODataQueryOptionsHandler.cs

@@ -53,6 +53,17 @@ public ODataQueryOptionsHandler(HttpMessageHandler innerHandler)
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> for the request.</param>
         /// <returns></returns>
         protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            request = AddDollarSignToQueryParameters(request);
+            return base.SendAsync(request, cancellationToken);
+        }
+
+        /// <summary>
+        /// Add `$` to all standard OData query options. v1.0 endpoint requires $ to be prefixed to all OData query options.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        private HttpRequestMessage AddDollarSignToQueryParameters(HttpRequestMessage request)
         {
             if (request.RequestUri.Segments[1].ToLower().Contains("v1.0") && request.RequestUri.Query != null)
             {
@@ -65,12 +76,19 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
                         newRequestQuery = newRequestQuery.Replace(targetQueryParam, $"${targetQueryParam}");
                 }
 
-                UriBuilder uriBuilder = new UriBuilder(request.RequestUri);
-                uriBuilder.Query = newRequestQuery;
+                // Remove leading question mark. NET 4.x doesn't drop the question mark when appending it to Query property of UriBuilder.
+                if (newRequestQuery.Contains("?"))
+                {
+                    newRequestQuery = newRequestQuery.Split('?')[1];
+                }
+                UriBuilder uriBuilder = new UriBuilder(request.RequestUri)
+                {
+                    Query = newRequestQuery
+                };
                 request.RequestUri = uriBuilder.Uri;
             }
 
-            return base.SendAsync(request, cancellationToken);
+            return request;
         }
     }
 }