Skip to content

feat: add --token flag and LARAVEL_CLOUD_API_TOKEN env var support #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoshSalway wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add --token flag and LARAVEL_CLOUD_API_TOKEN env var support #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions app/Commands/BaseCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use RuntimeException;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;

use function Laravel\Prompts\confirm;
Expand All @@ -30,6 +31,18 @@ abstract class BaseCommand extends Command
use HasAClient;
use Validates;

protected function configure(): void
{
parent::configure();

$this->addOption(
'token',
null,
InputOption::VALUE_REQUIRED,
'Laravel Cloud API token (overrides stored tokens and LARAVEL_CLOUD_API_TOKEN env var)',
);
}

protected Form $form;

protected ?Resolvers $resolvers;
Expand Down
20 changes: 20 additions & 0 deletions app/Concerns/HasAClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ protected function ensureClient(bool $ignoreLocalConfig = false)

protected function ensureApiTokenExists(): void
{
// If a token is available via env var, no need to check config
$envToken = getenv('LARAVEL_CLOUD_API_TOKEN');
if ($envToken !== false && $envToken !== '') {
return;
}

$config = app(ConfigRepository::class);
$apiTokens = $config->apiTokens();

Expand All @@ -35,6 +41,20 @@ protected function ensureApiTokenExists(): void

protected function resolveApiToken(bool $ignoreLocalConfig = false): string
{
// --token flag takes highest priority
if ($this instanceof \Symfony\Component\Console\Command\Command
&& $this->getDefinition()->hasOption('token')
&& ($flagToken = $this->option('token'))
) {
return $flagToken;
}

// LARAVEL_CLOUD_API_TOKEN env var takes second priority
$envToken = getenv('LARAVEL_CLOUD_API_TOKEN');
if ($envToken !== false && $envToken !== '') {
return $envToken;
}

$config = app(ConfigRepository::class);
$apiTokens = $config->apiTokens();

Expand Down
Loading