archive/YouTubeScraper
Archived
1
0
Fork 0
Code Activity

Fixed authorization helpers

Browse Source
This commit is contained in:
Michael Gordeev
2019-12-05 17:01:21 +03:00
parent b7450edd9e
commit 040492d7be
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YouTube.API.Test/WatchLaterTest.cs
+3 -3
View File
@@ -21,9 +21,9 @@ namespace YouTube.API.Test
{ {
var task = AuthorizationHelpers.ExchangeToken(new ClientSecrets var task = AuthorizationHelpers.ExchangeToken(new ClientSecrets
{ {
ClientId = "1096685398208-u95rcpkqb4e1ijfmb8jdq3jsg37l8igv.apps.googleusercontent.com", ClientId = "CLIENT_ID",
ClientSecret = "IU5bbdjwvmx8ttJoXQ7e6JWd" ClientSecret = "CLIENT_SECRET"
}, "4/twFMhT4xSaAxls-rEayp8MxFI2Oy0knUdDbAXKnfyMkbDHaNyqhV6uM"); }, "SUCCESS_CODE");
task.Wait(); task.Wait();
UserCredential credential = task.Result; UserCredential credential = task.Result;
YouTube.API/Authorization/AuthorizationHelpers.cs
+6 -5
View File
@@ -14,13 +14,14 @@ namespace YouTube.Authorization
public static Uri Endpoint => "https://accounts.google.com/o/oauth2/approval".ToUri(); public static Uri Endpoint => "https://accounts.google.com/o/oauth2/approval".ToUri();
const string refreshEndpoint = "https://oauth2.googleapis.com/token"; const string refreshEndpoint = "https://oauth2.googleapis.com/token";
const string tokenEndpoint = "https://www.googleapis.com/oauth2/v4/token"; const string tokenEndpoint = "https://www.googleapis.com/oauth2/v4/token";
const string redirectUrl = "urn:ietf:wg:oauth:2.0:oob";
public static Uri FormQueryString(ClientSecrets clientSecrets, Uri redirectUri, params string[] scopes) public static Uri FormQueryString(ClientSecrets clientSecrets, params string[] scopes)
{ {
string clientId = Uri.EscapeDataString(clientSecrets.ClientId); string clientId = Uri.EscapeDataString(clientSecrets.ClientId);
string scopeStr = string.Join(" ", scopes); string scopeStr = string.Join(" ", scopes);
return $"https://accounts.google.com/o/oauth2/auth?client_id={clientId}&redirect_uri={redirectUri.AbsoluteUri}&response_type=code&scope={scopeStr}".ToUri(); return $"https://accounts.google.com/o/oauth2/auth?client_id={clientId}&redirect_uri={redirectUrl}&response_type=code&scope={scopeStr}".ToUri();
} }
public static async Task<UserCredential> ExchangeToken(ClientSecrets clientSecrets, string responseToken) public static async Task<UserCredential> ExchangeToken(ClientSecrets clientSecrets, string responseToken)
@@ -30,7 +31,7 @@ namespace YouTube.Authorization
Dictionary<string, string> requestBody = new Dictionary<string, string> Dictionary<string, string> requestBody = new Dictionary<string, string>
{ {
{ "code", responseToken }, { "code", responseToken },
//{ "redirect_uri", redirectUrl }, { "redirect_uri", redirectUrl },
{ "grant_type", "authorization_code" }, { "grant_type", "authorization_code" },
{ "client_id", clientSecrets.ClientId }, { "client_id", clientSecrets.ClientId },
{ "client_secret", clientSecrets.ClientSecret } { "client_secret", clientSecrets.ClientSecret }
@@ -39,7 +40,7 @@ namespace YouTube.Authorization
HttpResponseMessage response = await client.PostAsync(tokenEndpoint, new FormUrlEncodedContent(requestBody)); HttpResponseMessage response = await client.PostAsync(tokenEndpoint, new FormUrlEncodedContent(requestBody));
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
return null; throw new Exception(await response.Content.ReadAsStringAsync());
string responseString = await response.Content.ReadAsStringAsync(); string responseString = await response.Content.ReadAsStringAsync();
dynamic responseData = JsonConvert.DeserializeObject(responseString); dynamic responseData = JsonConvert.DeserializeObject(responseString);
@@ -79,7 +80,7 @@ namespace YouTube.Authorization
HttpResponseMessage response = await client.PostAsync(refreshEndpoint, new FormUrlEncodedContent(requestBody)); HttpResponseMessage response = await client.PostAsync(refreshEndpoint, new FormUrlEncodedContent(requestBody));
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
return null; throw new Exception(await response.Content.ReadAsStringAsync());
string responseString = await response.Content.ReadAsStringAsync(); string responseString = await response.Content.ReadAsStringAsync();
dynamic responseData = JsonConvert.DeserializeObject(responseString); dynamic responseData = JsonConvert.DeserializeObject(responseString);