RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make token private

This commit is contained in:
Dean Herbert 2021-03-24 13:20:44 +09:00
parent a0c6c4da35
commit 84b2f9a848
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
View File

@ -67,8 +67,8 @@ protected override void LoadAsyncComplete()
{
base.LoadAsyncComplete();
if (Token == null)
return; // Todo: Somehow handle token retrieval failure.
if (!ValidForResume)
return; // token retrieval may have failed.
client.MatchStarted += onMatchStarted;
client.ResultsReady += onResultsReady;

20
osu.Game/Screens/Play/SubmittingPlayer.cs
View File

@ -21,7 +21,7 @@ public abstract class SubmittingPlayer : Player
/// <summary>
/// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequest"/>.
/// </summary>
protected long? Token { get; private set; }
private long? token;
[Resolved]
private IAPIProvider api { get; set; }
@ -38,7 +38,7 @@ protected override void LoadAsyncComplete()
if (!api.IsLoggedIn)
{
handleFailure(new InvalidOperationException("API is not online."));
handleTokenFailure(new InvalidOperationException("API is not online."));
return;
}
@ -46,22 +46,24 @@ protected override void LoadAsyncComplete()
if (req == null)
{
handleFailure(new InvalidOperationException("Request could not be constructed."));
handleTokenFailure(new InvalidOperationException("Request could not be constructed."));
return;
}
req.Success += r =>
{
Token = r.ID;
token = r.ID;
tcs.SetResult(true);
};
req.Failure += handleFailure;
req.Failure += handleTokenFailure;
api.Queue(req);
tcs.Task.Wait();
void handleFailure(Exception exception)
base.LoadAsyncComplete();
void handleTokenFailure(Exception exception)
{
if (HandleTokenRetrievalFailure(exception))
{
@ -79,8 +81,6 @@ void handleFailure(Exception exception)
tcs.SetResult(false);
}
base.LoadAsyncComplete();
}
/// <summary>
@ -95,11 +95,11 @@ protected override async Task PrepareScoreForResultsAsync(Score score)
await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
// token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
if (Token == null)
if (token == null)
return;
var tcs = new TaskCompletionSource<bool>();
var request = CreateSubmissionRequest(score, Token.Value);
var request = CreateSubmissionRequest(score, token.Value);
request.Success += s =>
{