Reworked token check logic

Author: StanMenten99

app/Services/PloiAPI.php

@@ -82,22 +82,32 @@ private function handleError(Response $response): void
     {
         match ($response->status()) {
             404 => exit('Resource not found.'),
-            422 => $this->handleValidationError($response),
+            422, 403, 401 => $this->handleValidationError($response),
             default => $response
         };
     }
 
     private function handleValidationError(Response $response): never
     {
-        $errors = $response->json()['errors'];
+        $error = $response->json()['error']
+            ?? $response->json()['errors']
+            ?? $response->json()['message']
+            ?? null;
+
         $errorMessage = "\033[31m ==> \033[0m\033[1;37m";
 
-        foreach ($errors as $error) {
-            $errorMessage .= is_array($error) ? Arr::first($error) : $error;
-            $errorMessage .= ' ';
+        if ($error === "Unauthenticated.") {
+            $errorMessage .= "The given API key is incorrect. Use 'ploi:token --force' to set a new one.";
+        } elseif (is_string($error)) {
+            $errorMessage .= $error;
+        } elseif (is_array($error)) {
+            foreach ($error as $e) {
+                $errorMessage .= is_array($e) ? Arr::first($e) : $e;
+                $errorMessage .= ' ';
+            }
         }
 
-        exit($errorMessage."\033[0m\n");
+        exit($errorMessage . "\033[0m\n");
     }
 
     private function mergeResponseData(array $existing, array $new): array

app/Traits/EnsureHasToken.php

@@ -22,33 +22,7 @@ protected function ensureHasToken()
             exit(1);
         }
 
-        if (!$this->validateToken()) {
-            $this->info('Your ploi api token is invalid. Please set a valid token.');
-            $this->call('ploi:token');
-            exit(1);
-        }
-
         return true;
     }
 
-    protected function validateToken(): bool
-    {
-        $response = $this->ploi->checkUser();
-
-        if (empty($response) || !is_array($response)) {
-            return false;
-        }
-
-        $data = $response['data'] ?? [];
-
-        if (empty($data) || !is_array($data)) {
-            return false;
-        }
-
-        if (isset($data[0]['message']) && $data[0]['message'] === 'Unauthenticated.') {
-            return false;
-        }
-
-        return true;
-    }
 }