Throw nicer error message if HTML parsing failed

RaphiMC · Sep 12, 2024 · 6b29b4a · 6b29b4a
1 parent e64c5d5
commit 6b29b4a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/main/java/net/raphimc/minecraftauth/step/msa/StepCredentialsMsaCode.java b/src/main/java/net/raphimc/minecraftauth/step/msa/StepCredentialsMsaCode.java
@@ -167,15 +167,23 @@ protected MsaCode execute(final ILogger logger, final HttpClient httpClient, fin
     private JsonObject extractConfig(final String html) {
         switch (this.applicationDetails.getOAuthEnvironment()) {
             case LIVE: {
-                final JsonReader jsonReader = new JsonReader(new StringReader(html.substring(html.indexOf("var ServerData = ") + 17)));
-                jsonReader.setLenient(true);
-                return JsonUtil.GSON.fromJson(jsonReader, JsonObject.class);
+                try {
+                    final JsonReader jsonReader = new JsonReader(new StringReader(html.substring(html.indexOf("var ServerData = ") + 17)));
+                    jsonReader.setLenient(true);
+                    return JsonUtil.GSON.fromJson(jsonReader, JsonObject.class);
+                } catch (Throwable e) {
+                    throw new IllegalStateException("Could not extract config from html. This most likely indicates that the login was not successful", e);
+                }
             }
             case MICROSOFT_ONLINE_COMMON:
             case MICROSOFT_ONLINE_CONSUMERS: {
-                final JsonReader jsonReader = new JsonReader(new StringReader(html.substring(html.indexOf("$Config=") + 8)));
-                jsonReader.setLenient(true);
-                return JsonUtil.GSON.fromJson(jsonReader, JsonObject.class);
+                try {
+                    final JsonReader jsonReader = new JsonReader(new StringReader(html.substring(html.indexOf("$Config=") + 8)));
+                    jsonReader.setLenient(true);
+                    return JsonUtil.GSON.fromJson(jsonReader, JsonObject.class);
+                } catch (Throwable e) {
+                    throw new IllegalStateException("Could not extract config from html. This most likely indicates that the login was not successful", e);
+                }
             }
             default:
                 throw new IllegalStateException("Unsupported OAuthEnvironment: " + this.applicationDetails.getOAuthEnvironment());