h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 18:13:09 +08:00
Code Issues Releases Wiki Activity

Implement verification from within client

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-01-24 15:57:40 +01:00
parent ddc2bbeb9b
commit 445a7450e0
No known key found for this signature in database
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
osu.Game/Online/API/APIAccess.cs
View File

@ -230,8 +230,6 @@ namespace osu.Game.Online.API
try
{
authentication.AuthenticateWithLogin(ProvidedUsername, password);
state.Value = APIState.RequiresSecondFactorAuth;
return;
}
catch (Exception e)
{
@ -244,28 +242,6 @@ namespace osu.Game.Online.API
}
}
if (state.Value == APIState.RequiresSecondFactorAuth)
{
if (string.IsNullOrEmpty(SecondFactorCode))
return;
state.Value = APIState.Connecting;
LastLoginError = null;
// TODO: use code to ensure second factor authentication completed.
Thread.Sleep(1000);
bool success = SecondFactorCode == "00000000";
SecondFactorCode = null;
if (!success)
{
state.Value = APIState.RequiresSecondFactorAuth;
LastLoginError = new InvalidOperationException("Second factor auth failed");
SecondFactorCode = null;
return;
}
}
var userReq = new GetMeRequest();
userReq.Failure += ex =>
{
@ -285,14 +261,13 @@ namespace osu.Game.Online.API
state.Value = APIState.Failing;
}
};
userReq.Success += user =>
userReq.Success += me =>
{
user.Status.Value = configStatus.Value ?? UserStatus.Online;
me.Status.Value = configStatus.Value ?? UserStatus.Online;
setLocalUser(user);
setLocalUser(me);
// we're connected!
state.Value = APIState.Online;
state.Value = me.SessionVerified ? APIState.Online : APIState.RequiresSecondFactorAuth;
failureCount = 0;
};
@ -302,6 +277,34 @@ namespace osu.Game.Online.API
return;
}
if (state.Value == APIState.RequiresSecondFactorAuth)
{
if (string.IsNullOrEmpty(SecondFactorCode))
return;
state.Value = APIState.Connecting;
LastLoginError = null;
var verificationRequest = new VerifySessionRequest(SecondFactorCode);
verificationRequest.Success += () => state.Value = APIState.Online;
verificationRequest.Failure += ex =>
{
state.Value = APIState.RequiresSecondFactorAuth;
LastLoginError = ex;
SecondFactorCode = null;
};
if (!handleRequest(verificationRequest))
{
state.Value = APIState.Failing;
return;
}
if (state.Value != APIState.Online)
return;
}
var friendsReq = new GetFriendsRequest();
friendsReq.Failure += _ => state.Value = APIState.Failing;
friendsReq.Success += res =>