Skip to content
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

Jump to bottom

Fix 2FA verification via link not working correctly #26837

Merged
merged 2 commits into from Jan 31, 2024
Merged

Fix 2FA verification via link not working correctly #26837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4126dcb
Fix 2FA verification via link not working correctly
bdach Jan 30, 2024
19fe3a1
Merge branch 'master' into 2fa-not-verifying-via-link
peppy Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions osu.Game/Online/Notifications/WebSocket/WebSocketNotificationsClientConnector.cs
View file
Open in desktop
Expand Up @@ -29,14 +29,11 @@ public WebSocketNotificationsClientConnector(IAPIProvider api)

protected override async Task<PersistentEndpointClient> BuildConnectionAsync(CancellationToken cancellationToken)
{
var tcs = new TaskCompletionSource<string>();

var req = new GetNotificationsRequest();
req.Success += bundle => tcs.SetResult(bundle.Endpoint);
req.Failure += ex => tcs.SetException(ex);
api.Queue(req);

string endpoint = await tcs.Task.ConfigureAwait(false);
// must use `PerformAsync()`, since we may not be fully online yet
// (see `APIState.RequiresSecondFactorAuth` - in this state queued requests will not execute).
await api.PerformAsync(req).ConfigureAwait(false);
string endpoint = req.Response!.Endpoint;

ClientWebSocket socket = new ClientWebSocket();
socket.Options.SetRequestHeader(@"Authorization", @$"Bearer {api.AccessToken}");
Expand Down
3 changes: 2 additions & 1 deletion osu.Game/Online/PersistentEndpointClientConnector.cs
View file
Open in desktop
Expand Up @@ -69,6 +69,7 @@ private async Task connectIfPossible()
break;

case APIState.Online:
case APIState.RequiresSecondFactorAuth:
await connect().ConfigureAwait(true);
break;
}
Expand All @@ -83,7 +84,7 @@ private async Task connect()

try
{
while (apiState.Value == APIState.Online)
while (apiState.Value == APIState.RequiresSecondFactorAuth || apiState.Value == APIState.Online)
{
// ensure any previous connection was disposed.
// this will also create a new cancellation token source.
Expand Down