h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-23 05:39:53 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1444 from smoogipoo/webrequest-updates

Browse Source 
Apply osu!-side WebRequest changes
This commit is contained in:
Dean Herbert
2017-10-30 22:48:19 +09:00
committed by GitHub
Unverified
parent 009d8ca49e 40f3cb5db7
commit 757d8be95f
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu-framework
+1 -1
Submodule osu-framework updated: 5986f21268...ef10edfc75
osu.Desktop.Deploy/Program.cs
+1 -1
View File
@@ -390,7 +390,7 @@ namespace osu.Desktop.Deploy
public static void AuthenticatedBlockingPerform(this WebRequest r)
{
r.Headers.Add("Authorization", $"token {GitHubAccessToken}");
r.AddHeader("Authorization", $"token {GitHubAccessToken}");
r.Perform();
}
}
osu.Game/Online/API/APIRequest.cs
+3 -3
View File
@@ -36,7 +36,7 @@ namespace osu.Game.Online.API
return request;
}
private void request_Progress(WebRequest request, long current, long total) => API.Scheduler.Add(delegate { Progress?.Invoke(current, total); });
private void request_Progress(long current, long total) => API.Scheduler.Add(delegate { Progress?.Invoke(current, total); });
protected APIDownloadRequest()
{
@@ -99,8 +99,8 @@ namespace osu.Game.Online.API
throw new TimeoutException(@"API request timeout hit");
WebRequest = CreateWebRequest();
WebRequest.RetryCount = 0;
WebRequest.Headers[@"Authorization"] = $@"Bearer {api.AccessToken}";
WebRequest.AllowRetryOnTimeout = false;
WebRequest.AddHeader("Authorization", $"Bearer {api.AccessToken}");
if (checkAndProcessFailure())
return;
osu.Game/Online/API/OAuth.cs
+9 -6
View File
@@ -127,7 +127,8 @@ namespace osu.Game.Online.API
protected override void PrePerform()
{
Parameters[@"refresh_token"] = RefreshToken;
AddParameter("refresh_token", RefreshToken);
base.PrePerform();
}
}
@@ -146,8 +147,9 @@ namespace osu.Game.Online.API
protected override void PrePerform()
{
Parameters[@"username"] = Username;
Parameters[@"password"] = Password;
AddParameter("username", Username);
AddParameter("password", Password);
base.PrePerform();
}
}
@@ -161,9 +163,10 @@ namespace osu.Game.Online.API
protected override void PrePerform()
{
Parameters[@"grant_type"] = GrantType;
Parameters[@"client_id"] = ClientId;
Parameters[@"client_secret"] = ClientSecret;
AddParameter("grant_type", GrantType);
AddParameter("client_id", ClientId);
AddParameter("client_secret", ClientSecret);
base.PrePerform();
}
}