De-dupe tokens on successful auth

app/Commands/Auth.php

@@ -103,10 +103,39 @@ public function handle()
             return 1;
         }
 
-        foreach ($tokens as $tokenData) {
-            $this->config->addApiToken($tokenData['token']);
+        $newByOrgId = spin(
+            function () use ($tokens) {
+                return collect($tokens)->mapWithKeys(function ($tokenData) {
+                    $client = new Connector($tokenData['token']);
+                    $org = $client->meta()->organization();
+
+                    return [$org->id => $tokenData['token']];
+                });
+            },
+            'Syncing tokens...',
+        );
+
+        $existingTokens = $this->config->apiTokens();
+
+        if ($existingTokens->isNotEmpty()) {
+            $existingByOrgId = $existingTokens->mapWithKeys(function ($token) {
+                try {
+                    $client = new Connector($token);
+                    $org = $client->meta()->organization();
+
+                    return [$org->id => $token];
+                } catch (SaloonRequestException) {
+                    return [];
+                }
+            })->filter();
+
+            $newByOrgId = $existingByOrgId->merge($newByOrgId);
+        }
+
+        $this->config->setApiTokens($newByOrgId->values());
 
-            info("✓ Authenticated with {$tokenData['organization_name']}");
+        foreach ($tokens as $tokenData) {
+            success("Authenticated with <comment>{$tokenData['organization_name']}</comment>");
         }
 
         outro('Authentication successful! Tokens saved to '.$this->config->path());

app/Concerns/HasAClient.php

@@ -9,9 +9,11 @@
 use App\Support\DetectsNonInteractiveEnvironments;
 use Illuminate\Support\Facades\Artisan;
 use RuntimeException;
+use Saloon\Exceptions\Request\RequestException;
 
 use function Laravel\Prompts\select;
 use function Laravel\Prompts\spin;
+use function Laravel\Prompts\warning;
 
 trait HasAClient
 {
@@ -51,14 +53,38 @@ protected function resolveApiToken(bool $ignoreLocalConfig = false): string
             $orgs = spin(
                 function () use ($apiTokens) {
                     return $apiTokens->mapWithKeys(function ($token) {
-                        $client = new Connector($token);
-
-                        return [$token => $client->meta()->organization()];
-                    });
+                        try {
+                            $client = new Connector($token);
+
+                            return [$token => $client->meta()->organization()];
+                        } catch (RequestException $e) {
+                            if ($e->getResponse()->status() === 401) {
+                                return [];
+                            }
+
+                            throw $e;
+                        }
+                    })->filter();
                 },
                 'Fetching token details',
             );
 
+            if ($orgs->count() < $apiTokens->count()) {
+                $config->setApiTokens($orgs->keys());
+            }
+
+            if ($orgs->isEmpty()) {
+                warning('All stored API tokens are no longer valid. Please re-authenticate with: cloud auth');
+
+                Artisan::call(Auth::class);
+
+                return $this->resolveApiToken($ignoreLocalConfig);
+            }
+
+            if ($orgs->count() === 1) {
+                return $orgs->keys()->first();
+            }
+
             if (! $ignoreLocalConfig && $defaultOrganizationId = app(LocalConfig::class)->get('organization_id')) {
                 foreach ($orgs as $token => $organization) {
                     if ($organization->id === $defaultOrganizationId) {

app/ConfigRepository.php

@@ -38,6 +38,12 @@ public function apiTokens(): Collection
         return collect($this->get('api_tokens', []));
     }
 
+    public function setApiTokens(Collection $tokens): void
+    {
+        $this->config['api_tokens'] = $tokens->unique()->values();
+        $this->save();
+    }
+
     public function addApiToken(string $token): void
     {
         $this->config['api_tokens'] = $this->apiTokens()->push($token);