Fix regression issue and readd basic auth support (#328)

beyondcode · Jul 4, 2022 · 2d3b10b · 2d3b10b
1 parent 5d99a0d
commit 2d3b10b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/app/Client/Configuration.php b/app/Client/Configuration.php
@@ -16,13 +16,18 @@ class Configuration
     /** @var string|null */
     protected $auth;
 
-    public function __construct(string $host, int $port, ?string $auth = null)
+    /** @var string|null */
+    protected $basicAuth;
+
+    public function __construct(string $host, int $port, ?string $auth = null, ?string $basicAuth = null)
     {
         $this->serverHost = $this->host = $host;
 
         $this->port = $port;
 
         $this->auth = $auth;
+
+        $this->basicAuth = $basicAuth;
     }
 
     public function host(): string
@@ -45,6 +50,11 @@ public function auth(): ?string
         return $this->auth;
     }
 
+    public function basicAuth(): ?string
+    {
+        return $this->basicAuth;
+    }
+
     public function port(): int
     {
         return intval($this->port);

diff --git a/app/Client/Factory.php b/app/Client/Factory.php
@@ -28,6 +28,9 @@ class Factory
     /** @var string */
     protected $auth = '';
 
+    /** @var string */
+    protected $basicAuth;
+
     /** @var \React\EventLoop\LoopInterface */
     protected $loop;
 
@@ -67,6 +70,13 @@ public function setAuth(?string $auth)
         return $this;
     }
 
+    public function setBasicAuth(?string $basicAuth)
+    {
+        $this->basicAuth = $basicAuth;
+
+        return $this;
+    }
+
     public function setLoop(LoopInterface $loop)
     {
         $this->loop = $loop;
@@ -77,7 +87,7 @@ public function setLoop(LoopInterface $loop)
     protected function bindConfiguration()
     {
         app()->singleton(Configuration::class, function ($app) {
-            return new Configuration($this->host, $this->port, $this->auth);
+            return new Configuration($this->host, $this->port, $this->auth, $this->basicAuth);
         });
     }
 

diff --git a/app/Client/Http/Modifiers/CheckBasicAuthentication.php b/app/Client/Http/Modifiers/CheckBasicAuthentication.php
@@ -89,7 +89,7 @@ protected function requiresAuthentication(): bool
     protected function getCredentials()
     {
         try {
-            $credentials = explode(':', $this->configuration->auth());
+            $credentials = explode(':', $this->configuration->basicAuth());
 
             return [
                 $credentials[0] => $credentials[1],

diff --git a/app/Commands/ShareCommand.php b/app/Commands/ShareCommand.php
@@ -9,7 +9,7 @@
 
 class ShareCommand extends ServerAwareCommand
 {
-    protected $signature = 'share {host} {--subdomain=} {--auth=} {--dns=} {--domain=}';
+    protected $signature = 'share {host} {--subdomain=} {--auth=} {--basicAuth=} {--dns=} {--domain=}';
 
     protected $description = 'Share a local url with a remote expose server';
 
@@ -53,6 +53,7 @@ public function handle()
             ->setHost($this->getServerHost())
             ->setPort($this->getServerPort())
             ->setAuth($auth)
+            ->setBasicAuth($this->option('basicAuth'))
             ->createClient()
             ->share(
                 $this->argument('host'),