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

Add fallback to use `Message` when `Hint` is not available

This commit is contained in:
Dean Herbert 2021-10-04 16:18:55 +09:00
parent 266b4c7124
commit 3a0b7ba8ff
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Online/API/OAuth.cs
View File

@ -62,7 +62,7 @@ internal void AuthenticateWithLogin(string username, string password)
// attempt to decode a displayable error string. // attempt to decode a displayable error string.
var error = JsonConvert.DeserializeObject<OAuthError>(req.GetResponseString() ?? string.Empty); var error = JsonConvert.DeserializeObject<OAuthError>(req.GetResponseString() ?? string.Empty);
if (error != null) if (error != null)
throwableException = new APIException(error.Message, ex); throwableException = new APIException(error.UserDisplayableError, ex);
} }
catch catch
{ {
@ -201,10 +201,15 @@ protected override void PrePerform()
private class OAuthError private class OAuthError
{ {
public string UserDisplayableError => !string.IsNullOrEmpty(Hint) ? Hint : ErrorIdentifier;
[JsonProperty("error")] [JsonProperty("error")]
public string ErrorType { get; set; } public string ErrorIdentifier { get; set; }
[JsonProperty("hint")] [JsonProperty("hint")]
public string Hint { get; set; }
[JsonProperty("message")]
public string Message { get; set; } public string Message { get; set; }
} }
} }