Set default Authentication Name

OctopyID · Apr 8, 2023 · 28cdba8 · 28cdba8
1 parent ad833e0
commit 28cdba8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/app/Commands/CreateAuthCommand.php b/app/Commands/CreateAuthCommand.php
@@ -34,7 +34,7 @@ class CreateAuthCommand extends Command
     public function handle(Config $config) : void
     {
         if (! $this->argument('name')) {
-            $this->input->setArgument('name', $this->ask('ENTER NAME'));
+            $this->input->setArgument('name', 'default');
         }
 
         foreach (['auth', 'host'] as $option) {

diff --git a/app/Commands/ListAlbumsCommand.php b/app/Commands/ListAlbumsCommand.php
@@ -2,16 +2,11 @@
 
 namespace App\Commands;
 
-use App\Config\Config;
 use App\Exceptions\InvalidTokenException;
 use App\GPhoto;
-use App\Listeners\TokenListener;
-use Exception;
 use Google\ApiCore\ApiException;
 use Google\ApiCore\ValidationException;
 use Google\Photos\Types\Album;
-use Illuminate\Support\Facades\Process;
-use JetBrains\PhpStorm\NoReturn;
 use LaravelZero\Framework\Commands\Command;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -38,12 +33,11 @@ class ListAlbumsCommand extends Command
      */
     public function handle() : void
     {
-        $auth = $this->option('auth');
-        if (! $auth) {
-            $auth = 'default';
+        if (! $this->option('auth')) {
+            $this->input->setOption('auth', 'default');
         }
 
-        $gphoto = new GPhoto($auth);
+        $gphoto = new GPhoto($this->option('auth'));
 
         $response = $gphoto->client()->listAlbums([
             'excludeNonAppCreatedData' => true,

diff --git a/app/Commands/ReloadAuthCommand.php b/app/Commands/ReloadAuthCommand.php
@@ -34,7 +34,7 @@ class ReloadAuthCommand extends Command
     public function handle() : void
     {
         if (! $this->argument('name')) {
-            $this->input->setArgument('name', $this->ask('ENTER NAME'));
+            $this->input->setArgument('name', 'default');
         }
 
         $gphoto = new GPhoto($this->argument('name'));

diff --git a/app/Commands/UploadAlbumCommand.php b/app/Commands/UploadAlbumCommand.php
@@ -33,11 +33,15 @@ class UploadAlbumCommand extends Command
      */
     public function handle() : void
     {
+        if (! $this->option('auth')) {
+            $this->input->setOption('auth', 'default');
+        }
+
         $gphoto = new GPhoto($this->option('auth'));
 
         if (! file_exists($gphoto->path('config.json'))) {
             $this->components->warn(
-                'CONFIG NOT EXISTS run "gphoto token:create" instead'
+                'CONFIG NOT EXISTS run "gphoto auth:create" instead'
             );
 
             return;

diff --git a/app/Commands/UploadPhotoCommand.php b/app/Commands/UploadPhotoCommand.php
@@ -45,11 +45,15 @@ class UploadPhotoCommand extends Command
      */
     public function handle() : void
     {
+        if (! $this->option('auth')) {
+            $this->input->setOption('auth', 'default');
+        }
+
         $gphoto = new GPhoto($this->option('auth'));
 
         if (! file_exists($gphoto->path('storage/token'))) {
             $this->components->error(
-                'TOKEN NOT EXISTS run "gphoto token:create" instead'
+                'TOKEN NOT EXISTS run "gphoto auth:create" instead'
             );
 
             return;