Add support for 2FA and increase deploy timeout

Author: mpociot

app/Commands/DeployCommand.php

@@ -3,22 +3,23 @@
 namespace App\Commands;
 
 use App\Support\Configuration;
+use Carbon\CarbonInterval;
 use Illuminate\Console\Scheduling\Schedule;
 use Laravel\Forge\Forge;
 use LaravelZero\Framework\Commands\Command;
 
 class DeployCommand extends ForgeCommand
 {
-    protected $signature = 'deploy {environment=production} {--update-script}';
+    protected $signature = 'deploy {environment=production} {--update-script} {--no-wait}';
 
     protected $description = 'Deploy the current project to Forge';
 
     public function handle(Forge $forge, Configuration $configuration)
     {
-        if (! $this->ensureHasToken()) {
+        if (!$this->ensureHasToken()) {
             return 1;
         }
-        if (! $this->ensureHasForgeConfiguration()) {
+        if (!$this->ensureHasForgeConfiguration()) {
             return 1;
         }
 
@@ -39,16 +40,20 @@ public function handle(Forge $forge, Configuration $configuration)
 
         $forge->deploySite($serverId, $siteId);
 
-        $forge->retry($forge->timeout, function () use ($serverId, $siteId, $forge) {
-            $site = $forge->site($serverId, $siteId);
+        if (!$this->option('no-wait')) {
+            $forge->retry(CarbonInterval::minutes(10)->totalSeconds, function () use ($serverId, $siteId, $forge) {
+                $site = $forge->site($serverId, $siteId);
 
-            return is_null($site->deploymentStatus);
-        }, 5);
+                return is_null($site->deploymentStatus);
+            }, 5);
+        }
 
         $this->info('The site has been deployed');
 
-        $this->call('deploy:log', [
-            'environment' => $environment,
-        ]);
+        if (!$this->option('no-wait')) {
+            $this->call('deploy:log', [
+                'environment' => $environment,
+            ]);
+        }
     }
 }

app/Commands/LoginCommand.php

@@ -17,6 +17,7 @@
 class LoginCommand extends Command
 {
     const LOGIN_URL = 'https://forge.laravel.com/auth/login';
+    const TWO_FACTOR_AUTH_URL = 'https://forge.laravel.com/auth/token';
 
     const TOKEN_URL = 'https://forge.laravel.com/oauth/personal-access-tokens';
 
@@ -59,7 +60,17 @@ protected function login($email, $password)
 
         $uri = $browser->getHistory()->current()->getUri();
 
-        if ($uri === static::LOGIN_URL) {
+        if ($uri === static::TWO_FACTOR_AUTH_URL) {
+            $token = $this->ask('What is your 2FA token?');
+
+            $browser->submitForm('Verify', [
+                'token' => $token,
+            ]);
+
+            $uri = $browser->getHistory()->current()->getUri();
+        }
+
+        if ($uri === static::LOGIN_URL || $uri === static::TWO_FACTOR_AUTH_URL) {
             $this->error('Invalid credentials.');
             exit();
         }

builds/forge

@@ -26,7 +26,7 @@
     |
     */
 
-    'version' => '1.0.5',
+    'version' => '1.1.0',
 
     /*
     |--------------------------------------------------------------------------