Check if the user has the auth bot account blocked upon auth failure, and return a special message

Author: dankmeme01

CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(argon VERSION 1.4.7)
+project(argon VERSION 1.4.8)
 
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS
 	src/*.cpp

README.md

@@ -18,7 +18,7 @@ Benefits compared to some of the other auth APIs (Globed, DashAuth, GDAuth):
 First, add Argon to the `CMakeLists.txt` of your mod:
 
 ```cmake
-CPMAddPackage("gh:GlobedGD/argon@1.4.7")
+CPMAddPackage("gh:GlobedGD/argon@1.4.8")
 target_link_libraries(${PROJECT_NAME} argon)
 ```
 

changelog.md

@@ -1,3 +1,7 @@
+# 1.4.8
+
+* Check if the user has the auth bot account blocked upon auth failure, and return a special message
+
 # 1.4.7
 
 * Make `getGameAccountData` print a warning instead of crashing when called off main thread

src/Main.cpp

@@ -140,12 +140,18 @@ static Future<Result<>> submitSolution(const AccountData& account, std::string_v
     co_return co_await web::submitGDMessage(account, id, text);
 }
 
-static Future<std::string> troubleshootFailureCause(const AccountData& account) {
+static Future<std::string> troubleshootFailureCause(const AccountData& account, int targetId) {
     auto result = co_await web::checkGDMessageLimit(account);
     if (result.isErr()) {
         co_return std::move(result).unwrapErr();
     }
-    co_return "Stage 2 failed due to unknown error, auth and message limit are OK";
+
+    result = co_await web::checkGDUserNotBlocked(account, targetId);
+    if (result.isErr()) {
+        co_return std::move(result).unwrapErr();
+    }
+
+    co_return "Stage 2 failed due to unknown error, all sanity checks succeeded";
 }
 
 AuthFuture startAuth(AuthOptions options) {
@@ -179,7 +185,7 @@ AuthFuture startAuth(AuthOptions options) {
     auto solution = solveChallenge(s1data.challenge);
     auto s2res = co_await submitSolution(options.account, solution, s1data.id);
     if (!s2res) {
-        co_return Err(co_await troubleshootFailureCause(options.account));
+        co_return Err(co_await troubleshootFailureCause(options.account, s1data.id));
     }
 
     progress(AuthProgress::VerifyingChallenge);

src/Web.cpp

@@ -279,4 +279,42 @@ Future<Result<>> checkGDMessageLimit(const AccountData& account) {
     co_return Ok();
 }
 
+Future<Result<>> checkGDUserNotBlocked(const AccountData& account, int targetUser) {
+    auto payload = fmt::format(
+        "accountID={}&gjp2={}&gameVersion=22&binaryVersion=45"
+        "&secret=Wmfd2893gb7&type=1&dvs=3",
+        account.accountId, account.gjp2
+    );
+
+    auto response = co_await baseGDRequest()
+        .bodyString(payload)
+        .post(fmt::format("{}/getGJUserList20.php", account.serverUrl));
+
+    ARC_CO_UNWRAP_INTO(response, wrapResponse("fetch GD blocklist", std::move(response)));
+    auto str = response.string().unwrapOrDefault();
+    if (str.empty()) {
+        co_return Err(wrapError(response, "fetch GD messages"));
+    }
+
+    if (str == "-1") {
+        co_return Err("Invalid account credentials, please try to Refresh Login in account settings");
+    } else if (str == "-2") {
+        co_return Ok();
+    } else if (str.starts_with("-")) {
+        co_return Err("Unexpected server response while fetching blocklist: {}", str);
+    }
+
+    std::string targetStr = fmt::to_string(targetUser);
+
+    for (auto user : asp::iter::split(str, "|")) {
+        for (auto [k, v] : asp::iter::split(user, ':').arrayChunks<2>()) {
+            if (k == "16" && v == targetStr) {
+                co_return Err("You have blocked the authentication bot account, please unblock it and try again");
+            }
+        }
+    }
+
+    co_return Ok();
+}
+
 }

src/Web.hpp

@@ -26,5 +26,6 @@ arc::Future<geode::Result<>> submitGDMessage(const AccountData& account, int tar
 arc::Future<geode::Result<>> deleteGDMessage(const AccountData& account, int id);
 arc::Future<geode::Result<>> submitGDComment(const AccountData& account, int target, std::string_view message);
 arc::Future<geode::Result<>> checkGDMessageLimit(const AccountData& account);
+arc::Future<geode::Result<>> checkGDUserNotBlocked(const AccountData& account, int targetUser);
 
 }