From 5aaafce597e370f9c6c900d3c9f9e992499e0361 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Oct 2021 15:40:00 +0900
Subject: [PATCH] Make `AuthenticateWithLogin` throw instead of return a `bool`
 success status

---
 .../ErrorTextFlowContainer.cs                 |  2 +-
 osu.Game/Online/API/OAuth.cs                  | 37 ++++++++++++++++---
 2 files changed, 32 insertions(+), 7 deletions(-)
 rename osu.Game/{Overlays/AccountCreation => Graphics}/ErrorTextFlowContainer.cs (95%)

diff --git a/osu.Game/Overlays/AccountCreation/ErrorTextFlowContainer.cs b/osu.Game/Graphics/ErrorTextFlowContainer.cs
similarity index 95%
rename from osu.Game/Overlays/AccountCreation/ErrorTextFlowContainer.cs
rename to osu.Game/Graphics/ErrorTextFlowContainer.cs
index 87ff4dd398..f17a2a2c3d 100644
--- a/osu.Game/Overlays/AccountCreation/ErrorTextFlowContainer.cs
+++ b/osu.Game/Graphics/ErrorTextFlowContainer.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK.Graphics;
 
-namespace osu.Game.Overlays.AccountCreation
+namespace osu.Game.Graphics
 {
     public class ErrorTextFlowContainer : OsuTextFlowContainer
     {
diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs
index bdc47aab8d..693e7c5336 100644
--- a/osu.Game/Online/API/OAuth.cs
+++ b/osu.Game/Online/API/OAuth.cs
@@ -1,8 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Diagnostics;
 using System.Net.Http;
+using Newtonsoft.Json;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Online.API
@@ -32,10 +34,10 @@ namespace osu.Game.Online.API
             this.endpoint = endpoint;
         }
 
-        internal bool AuthenticateWithLogin(string username, string password)
+        internal void AuthenticateWithLogin(string username, string password)
         {
-            if (string.IsNullOrEmpty(username)) return false;
-            if (string.IsNullOrEmpty(password)) return false;
+            if (string.IsNullOrEmpty(username)) throw new ArgumentException("Missing username.");
+            if (string.IsNullOrEmpty(password)) throw new ArgumentException("Missing password.");
 
             using (var req = new AccessTokenRequestPassword(username, password)
             {
@@ -49,13 +51,27 @@ namespace osu.Game.Online.API
                 {
                     req.Perform();
                 }
-                catch
+                catch (Exception ex)
                 {
-                    return false;
+                    Token.Value = null;
+
+                    var throwableException = ex;
+
+                    try
+                    {
+                        // 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);
+                    }
+                    catch
+                    {
+                    }
+
+                    throw throwableException;
                 }
 
                 Token.Value = req.ResponseObject;
-                return true;
             }
         }
 
@@ -182,5 +198,14 @@ namespace osu.Game.Online.API
                 base.PrePerform();
             }
         }
+
+        private class OAuthError
+        {
+            [JsonProperty("error")]
+            public string ErrorType { get; set; }
+
+            [JsonProperty("hint")]
+            public string Message { get; set; }
+        }
     }
 }