update

Author: CodeWithSushil

src/Supabase/Exceptions.php src/Supabase/Exceptions/Exceptions.phpsrc/Supabase/Exceptions.php renamed to src/Supabase/Exceptions/Exceptions.php

@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+namespace Supabase\Client\Exceptions;
+
+use RuntimeException;
+
+class InvalidProjectUrlException extends RuntimeException
+{
+    //
+}

src/Supabase/Exceptions/InvalidProjectUrlException.php

@@ -4,22 +4,16 @@
 
 namespace Supabase\Client\Http;
 
-use Psr\Http\Message\ResponseInterface;
-use JsonException;
-
 class Response
 {
-    private ResponseInterface $response;
+    public function __construct(
+        protected string $body,
+        protected int $status,
+        protected array $headers = []
+    ) {}
 
-    public function __construct(ResponseInterface $response)
+    public function json(): array|null
     {
-        $this->response = $response;
-    }
-
-    public function json(): mixed
-    {
-        $content = (string) $this->response->getBody();
-
-        return json_decode($content, true, 512, JSON_THROW_ON_ERROR);
+        return json_decode($this->body, true);
     }
 }

src/Supabase/Functions.php

@@ -7,6 +7,8 @@
 use Supabase\Client\Http\CurlClient;
 use Supabase\Client\Http\Request;
 use Supabase\Client\Query\QueryBuilder;
+use Supabase\Client\Validation\ProjectUrlValidator;
+
 
 class Supabase
 {
@@ -16,6 +18,7 @@ public function __construct(
         private string $url,
         private string $token
     ) {
+        ProjectUrlValidator::Validate($this->url);
         $this->request = new Request(
             new CurlClient()
         );

src/Supabase/Http/Response.php

@@ -8,17 +8,50 @@
 
 class ProjectUrlValidator
 {
-    public static function validate(string $url): void
-    {
-        if (!filter_var($url, FILTER_VALIDATE_URL)) {
+    public static function validate(
+        string $url
+    ): void {
+        if (!filter_var(
+            $url,
+            FILTER_VALIDATE_URL
+        )) {
             throw new InvalidProjectUrlException(
-                'Invalid Supabase project URL.'
+                'Invalid project URL.'
             );
         }
 
-        if (!str_contains($url, '.supabase.co')) {
+        $parts = parse_url($url);
+
+        /*
+        |--------------------------------------------------------------------------
+        | HTTPS Required
+        |--------------------------------------------------------------------------
+        */
+
+        if (
+            !isset($parts['scheme']) ||
+            strtolower($parts['scheme']) !== 'https'
+        ) {
+            throw new InvalidProjectUrlException(
+                'Supabase URL must use HTTPS.'
+            );
+        }
+
+        /*
+        |--------------------------------------------------------------------------
+        | Valid Supabase Domain
+        |--------------------------------------------------------------------------
+        */
+
+        if (
+            !isset($parts['host']) ||
+            !str_ends_with(
+                $parts['host'],
+                '.supabase.co'
+            )
+        ) {
             throw new InvalidProjectUrlException(
-                'Invalid Supabase domain.'
+                'Invalid Supabase project domain.'
             );
         }
     }