Include auth error when auth fails on whoami

PennyDreadfulMTG · Jan 27, 2024 · 64f8144 · 64f8144
1 parent 1287f8d
commit 64f8144
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/gatherling/api.php b/gatherling/api.php
@@ -157,10 +157,10 @@
         break;
 
     case 'whoami':
-        auth();
+        $auth_error = auth();
         $player = Player::getSessionPlayer();
         if (is_null($player)) {
-            error('Not Logged in', ['name' => null]);
+            error('Not Logged in', ['name' => null, 'auth_error' => $auth_error]);
         }
 
         $result = repr_json_player($player);

diff --git a/gatherling/api_lib.php b/gatherling/api_lib.php
@@ -45,7 +45,7 @@ function is_admin()
     return false;
 }
 
-/** @return bool  */
+/** @return string  */
 function auth()
 {
     $username = null;
@@ -60,16 +60,19 @@ function auth()
     }
 
     if (is_null($username) || is_null($apikey)) {
-        return false;
+        return "Auth not provided";
     }
 
     $player = Player::findByName($username);
     if (is_null($player)) {
-        return false;
+        return "Can't find a user called $username";
     }
     if ($player->api_key == $apikey) {
         $_SESSION['username'] = $player->name;
     }
+    else {
+        return "Invalid API Key";
+    }
 
     return Player::isLoggedIn();
 }