Skip to content

Fix crash when logging in with discord #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Germ-99 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix crash when logging in with discord #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions DiscordOAuth.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public static async void OAuthLoginRefresh(string refresh_token)

try
{
HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v6/oauth2/token", new FormUrlEncodedContent(postDataDict));
HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v10/oauth2/token", new FormUrlEncodedContent(postDataDict));

if (!response.IsSuccessStatusCode)
{
Expand All @@ -193,7 +193,15 @@ public static async void OAuthLoginRefresh(string refresh_token)
}

string responseString = await response.Content.ReadAsStringAsync();
Dictionary<string, string> data = JsonConvert.DeserializeObject<Dictionary<string, string>>(responseString);
JObject jsonResponse = JObject.Parse(responseString);
Dictionary<string, string> data = new Dictionary<string, string>
{
{ "access_token", jsonResponse["access_token"]?.ToString() },
{ "refresh_token", jsonResponse["refresh_token"]?.ToString() },
{ "token_type", jsonResponse["token_type"]?.ToString() },
{ "expires_in", jsonResponse["expires_in"]?.ToString() },
{ "scope", jsonResponse["scope"]?.ToString() }
};
ProcessResponse(data);
}
}
Expand Down Expand Up @@ -224,9 +232,17 @@ public static async void OAuthLoginResponse(string code)

try
{
HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v6/oauth2/token", new FormUrlEncodedContent(postDataDict));
HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v10/oauth2/token", new FormUrlEncodedContent(postDataDict));
string responseString = await response.Content.ReadAsStringAsync();
Dictionary<string, string> data = JsonConvert.DeserializeObject<Dictionary<string, string>>(responseString);
JObject jsonResponse = JObject.Parse(responseString);
Dictionary<string, string> data = new Dictionary<string, string>
{
{ "access_token", jsonResponse["access_token"]?.ToString() },
{ "refresh_token", jsonResponse["refresh_token"]?.ToString() },
{ "token_type", jsonResponse["token_type"]?.ToString() },
{ "expires_in", jsonResponse["expires_in"]?.ToString() },
{ "scope", jsonResponse["scope"]?.ToString() }
};
ProcessResponse(data);
}
catch (HttpRequestException ex)
Expand Down Expand Up @@ -272,17 +288,25 @@ private static async void FetchUserDetails()
{
try
{
HttpResponseMessage userResponse = await client.GetAsync("https://discord.com/api/v6/users/@me");
HttpResponseMessage userResponse = await client.GetAsync("https://discord.com/api/v10/users/@me");
string responseString = await userResponse.Content.ReadAsStringAsync();
Dictionary<string, string> data = JsonConvert.DeserializeObject<Dictionary<string, string>>(responseString);
JObject jsonResponse = JObject.Parse(responseString);

if (data == null || !data.ContainsKey("username"))
if (jsonResponse == null || jsonResponse["username"] == null)
{
Logger.LogRow(Logger.LogType.Error, "Invalid user data received from OAuth server.");
return;
}

discordUserData = data;
discordUserData = new Dictionary<string, string>
{
{ "id", jsonResponse["id"]?.ToString() },
{ "username", jsonResponse["username"]?.ToString() },
{ "discriminator", jsonResponse["discriminator"]?.ToString() ?? "0" },
{ "avatar", jsonResponse["avatar"]?.ToString() },
{ "global_name", jsonResponse["global_name"]?.ToString() }
};

FetchAccessCodes();
}
catch (Exception ex)
Expand Down