Fixed VK authorization (#1166)

Co-authored-by: Vadim Anosov <code@laserwar.com>
vknet · May 25, 2021 · 98e1674 · 98e1674
1 parent 84ccc55
commit 98e1674
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/VkNet/Infrastructure/Authorization/ImplicitFlow/ImplicitFlow.cs b/VkNet/Infrastructure/Authorization/ImplicitFlow/ImplicitFlow.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Web;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 using VkNet.Abstractions.Authorization;
@@ -106,6 +107,12 @@ public Uri CreateAuthorizeUrl()
 
 		private async Task<AuthorizationResult> NextStepAsync(AuthorizationFormResult formResult)
 		{
+			var responseUrl = formResult.ResponseUrl;
+			if (responseUrl.OriginalString.StartsWith("https://oauth.vk.com/auth_redirect"))
+			{
+				responseUrl = GetRedirectUrl(responseUrl);
+			}
+
 			var pageType = _vkAuthorization.GetPageType(formResult.ResponseUrl);
 
 			switch (pageType)
@@ -164,6 +171,15 @@ private async Task<AuthorizationResult> NextStepAsync(AuthorizationFormResult fo
 			return await NextStepAsync(resultForm).ConfigureAwait(false);
 		}
 
+		private static Uri GetRedirectUrl(Uri originalUrl)
+		{
+			var originalString = originalUrl.OriginalString;
+			var query = HttpUtility.ParseQueryString(originalString);
+			var escapedUrl = query["authorize_url"];
+			var unEscapedUrl = Uri.UnescapeDataString(escapedUrl);
+			return new Uri(unEscapedUrl);
+		}
+
 		/// <summary>
 		/// Валидация параметров авторизации
 		/// </summary>

diff --git a/VkNet/VkNet.csproj b/VkNet/VkNet.csproj
@@ -55,12 +55,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="all"/>
-		<PackageReference Include="HtmlAgilityPack" Version="1.11.33"/>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
-		<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" PrivateAssets="all"/>
-		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.22.0.31243" PrivateAssets="all"/>
-		<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" PrivateAssets="all"/>
+		<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="all" />
+		<PackageReference Include="HtmlAgilityPack" Version="1.11.33" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" PrivateAssets="all" />
+		<PackageReference Include="SonarAnalyzer.CSharp" Version="8.22.0.31243" PrivateAssets="all" />
+		<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net461'">
@@ -89,4 +89,8 @@
 		<None Include="..\tools\vknet-icon.PNG" Pack="true" PackagePath="\" />
 		<None Include="..\LICENCE" Pack="true" PackagePath="\" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Reference Include="System.Web" />
+	</ItemGroup>
 </Project>