From 3a0b7ba8fffe61e85b8adceebf48a7eeffb10fd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Oct 2021 16:18:55 +0900
Subject: [PATCH] Add fallback to use `Message` when `Hint` is not available

---
 osu.Game/Online/API/OAuth.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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