From 4c8e6ccc263afa52ae5aa14ba78f6b25eab4c22a Mon Sep 17 00:00:00 2001
From: Jialin Xin <jixin@microsoft.com>
Date: Mon, 5 Jul 2021 11:21:55 +0800
Subject: [PATCH] Fix banning Uri.ToString().

---
 .../src/Bindings/WebPubSubConnection.cs                       | 2 +-
 .../src/Microsoft.Azure.WebJobs.Extensions.WebPubSub.csproj   | 1 -
 .../tests/WebPubSubServiceTests.cs                            | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Bindings/WebPubSubConnection.cs b/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Bindings/WebPubSubConnection.cs
index e7e1f0633388..a271e9114b77 100644
--- a/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Bindings/WebPubSubConnection.cs
+++ b/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Bindings/WebPubSubConnection.cs
@@ -14,7 +14,7 @@ public class WebPubSubConnection
     {
         public WebPubSubConnection(Uri url)
         {
-            Url = url.ToString();
+            Url = url.AbsoluteUri;
             BaseUrl = $"{url.Scheme}://{url.Authority}{url.AbsolutePath}";
             AccessToken = HttpUtility.ParseQueryString(url.Query)["access_token"];
         }
diff --git a/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Microsoft.Azure.WebJobs.Extensions.WebPubSub.csproj b/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Microsoft.Azure.WebJobs.Extensions.WebPubSub.csproj
index 9c714d02a52e..1d50284e0ff3 100644
--- a/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Microsoft.Azure.WebJobs.Extensions.WebPubSub.csproj
+++ b/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/src/Microsoft.Azure.WebJobs.Extensions.WebPubSub.csproj
@@ -7,7 +7,6 @@
     <Version>1.0.0-beta.2</Version>
     <NoWarn>$(NoWarn);AZC0001;CS1591;SA1636;CA1056</NoWarn>
     <IsExtensionClientLibrary>true</IsExtensionClientLibrary>
-    <EnableBannedApiAnalyzers>false</EnableBannedApiAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/tests/WebPubSubServiceTests.cs b/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/tests/WebPubSubServiceTests.cs
index 0ea70bdd2b6c..a1bb5b008cf1 100644
--- a/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/tests/WebPubSubServiceTests.cs
+++ b/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/tests/WebPubSubServiceTests.cs
@@ -20,6 +20,10 @@ public void TestWebPubSubConnection_Scheme(string connectionString, string expec
 
             Assert.NotNull(clientConnection);
             Assert.AreEqual(expectedBaseUrl, clientConnection.BaseUrl);
+            Assert.NotNull(clientConnection.AccessToken);
+
+            var absoluteUrl = $"{expectedBaseUrl}?access_token={clientConnection.AccessToken}";
+            Assert.AreEqual(absoluteUrl, clientConnection.Url);
         }
 
         [TestCase]