Fixed login command + use table() from prompt

unolia · Jul 17, 2024 · 0f25061 · 0f25061
1 parent 348a4da
commit 0f25061
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 18 deletions.
diff --git a/app/Commands/DigCommand.php b/app/Commands/DigCommand.php
@@ -9,6 +9,7 @@
 use React\Dns\Query\UdpTransportExecutor;
 
 use function Laravel\Prompts\select;
+use function Laravel\Prompts\table;
 
 class DigCommand extends Command implements PromptsForMissingInput
 {
@@ -49,14 +50,14 @@ public function handle()
             ->then(function (Message $message) use (&$table, $type_string) {
                 foreach ($message->answers as $answer) {
                     $table[] = [
-                        'Name' => $answer->name,
-                        'Type' => $type_string,
-                        'TTL' => $answer->ttl,
-                        'Value' => is_array($answer->data) ? implode(' ', $answer->data) : $answer->data,
+                        $answer->name,
+                        $type_string,
+                        $answer->ttl,
+                        is_array($answer->data) ? implode(' ', $answer->data) : $answer->data,
                     ];
                 }
 
-                $this->table(['Name', 'Type', 'TTL', 'Value'], $table);
+                table(['Name', 'Type', 'TTL', 'Value'], $table);
             }, fn (\Throwable $e) => $this->error($e->getMessage()));
 
     }

diff --git a/app/Commands/DomainListCommand.php b/app/Commands/DomainListCommand.php
@@ -7,6 +7,8 @@
 use Unolia\UnoliaCLI\Helpers\Helpers;
 use Unolia\UnoliaCLI\Http\Integrations\Unolia\Requests\Domains;
 
+use function Laravel\Prompts\table;
+
 class DomainListCommand extends Command
 {
     protected $signature = 'domain:list';
@@ -25,6 +27,6 @@ public function handle()
             'Last synced at' => $domain['synced_at'] ? Carbon::make($domain['synced_at'])->diffForHumans() : 'Never synced',
         ])->toArray();
 
-        $this->table(['Domain', 'Team', 'Last Synced At'], $table);
+        table(['Domain', 'Team', 'Last Synced At'], $table);
     }
 }
diff --git a/app/Commands/DomainRecordsCommand.php b/app/Commands/DomainRecordsCommand.php
@@ -8,6 +8,8 @@
 use Unolia\UnoliaCLI\Helpers\Helpers;
 use Unolia\UnoliaCLI\Http\Integrations\Unolia\Requests\DomainsRecords;
 
+use function Laravel\Prompts\table;
+
 class DomainRecordsCommand extends Command implements PromptsForMissingInput
 {
     protected $signature = 'domain:records {domain}';
@@ -24,12 +26,12 @@ public function handle()
             '#' => $record['id'],
             'name' => $record['name'],
             'type' => $record['type'],
-            'ttl' => $record['ttl'],
+            'ttl' => $record['ttl'] ?: '---',
             'value' => Str::limit($record['value'], 20),
             'state' => $record['state'],
         ])->toArray();
 
-        $this->table(['#', 'Name', 'Type', 'TTL', 'Value', 'State'], $table);
+        table(['#', 'Name', 'Type', 'TTL', 'Value', 'State'], $table);
     }
 
     protected function promptForMissingArgumentsUsing(): array

diff --git a/app/Commands/LoginCommand.php b/app/Commands/LoginCommand.php
@@ -11,7 +11,7 @@
 use Unolia\UnoliaCLI\Http\Integrations\Unolia\Requests\CurrentToken;
 use Unolia\UnoliaCLI\Http\Integrations\Unolia\Requests\Login;
 
-use function Laravel\Prompts\password;
+use function Laravel\Prompts\form;
 use function Laravel\Prompts\text;
 
 class LoginCommand extends Command
@@ -31,22 +31,31 @@ public function handle()
                 $verify->throw();
 
                 $this->line('You are already logged in.');
-            } catch (Exception) {
-            }
 
-            return;
+                return;
+            } catch (Exception $e) {
+                \Laravel\Prompts\info('A token is already set, but it is expired. Please login again.');
+            }
         }
 
         $token_name = 'Token for '.get_current_user().'@'.gethostname();
 
-        $email = text('Email');
-        $password = password('Password');
+        $host = parse_url(config('settings.api.auth_url'), PHP_URL_HOST);
+        $responses = form()
+            ->text('Email',
+                required: true,
+                hint: 'Please provide your login credentials to '.$host,
+                name: 'email'
+            )
+            ->password('Password', required: true, name: 'password')
+            ->submit();
+
         $connector_auth = Helpers::getAuthConnector();
 
         try {
             $login = $connector_auth->send(new Login(
-                email: $email,
-                password: $password,
+                email: $responses['email'],
+                password: $responses['password'],
                 token_name: $token_name,
             ));
 
@@ -60,7 +69,8 @@ public function handle()
                 $two_factor_code = text('Two factor authentication code');
 
                 $login = $connector_auth->send(new Login(
-                    email: $email, password: $password,
+                    email: $responses['email'],
+                    password: $responses['password'],
                     two_factor_code: $two_factor_code,
                     token_name: $token_name,
                 ));

diff --git a/app/Commands/TeamsCommand.php b/app/Commands/TeamsCommand.php
@@ -6,6 +6,8 @@
 use Unolia\UnoliaCLI\Helpers\Helpers;
 use Unolia\UnoliaCLI\Http\Integrations\Unolia\Requests\Teams;
 
+use function Laravel\Prompts\table;
+
 class TeamsCommand extends Command
 {
     protected $signature = 'teams';
@@ -23,6 +25,6 @@ public function handle()
             'Team' => $team['name'],
         ])->toArray();
 
-        $this->table(['ID', 'Team'], $table);
+        table(['ID', 'Team'], $table);
     }
 }
diff --git a/builds/unolia b/builds/unolia
diff --git a/tests/Feature/LoginCommandTest.php b/tests/Feature/LoginCommandTest.php
@@ -3,3 +3,7 @@
 it('can authenticate a user', function () {});
 
 it('can authenticate a user with a token as parameter', function () {});
+
+it('can authenticate a user with 2fa', function () {});
+
+it('can authenticate a user whit an expired token in the config', function () {});