fixed valid versions / token bug

Author: mechelon

src/Endpoints/Endpoint.php

@@ -17,27 +17,16 @@ class Endpoint
     const SEARCH = 'search';
 
     public Notion $notion;
-    private Collection $validVersions;
-
 
     protected ?StartCursor $startCursor = null;
     protected int $pageSize = 100;
 
     public function __construct(Notion $notion)
     {
-        $this->validVersions = collect(["v1"]);
         $this->notion = $notion;
-    }
 
-    /**
-     * Checks if given version for notion-api is valid
-     *
-     * @param string $version
-     */
-    public function checkValidVersion(string $version): void
-    {
-        if (!$this->validVersions->contains($version)) {
-            throw WrapperException::instance("invalid version for notion-api", ['invalidVersion' => $version]);
+        if ($this->notion->getConnection() === null) {
+            throw WrapperException::instance("Connection could not be established, please check your token.");
         }
     }
 

src/Notion.php

@@ -2,6 +2,8 @@
 
 namespace FiveamCode\LaravelNotionApi;
 
+use FiveamCode\LaravelNotionApi\Exceptions\WrapperException;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Http\Client\PendingRequest;
 use FiveamCode\LaravelNotionApi\Endpoints\Pages;
@@ -18,8 +20,9 @@ class Notion
     private Endpoint $endpoint;
     private string $version;
     private string $token;
-    private PendingRequest $connection;
+    private ?PendingRequest $connection = null;
 
+    private Collection $validVersions;
 
     /**
      * Notion constructor.
@@ -30,11 +33,16 @@ public function __construct(string $version = null, string $token = null)
     {
         if ($token !== null) {
             $this->setToken($token);
-        } else {
-            $this->setToken(config('laravel-notion-api.notion-api-token'));
+        } elseif ($token === null) {
+
+            // check if Notion integration token is set in config
+            $token = config('laravel-notion-api.notion-api-token');
+
+            if ($token !== null)
+                $this->setToken($token);
         }
 
-        $this->endpoint = new Endpoint($this);
+        $this->validVersions = collect(["v1"]);
 
         if ($version !== null) {
             $this->setVersion($version);
@@ -61,7 +69,7 @@ private function connect(): Notion
      */
     public function setVersion(string $version): Notion
     {
-        $this->endpoint->checkValidVersion($version);
+        $this->checkValidVersion($version);
         $this->version = $version;
         return $this;
     }
@@ -148,10 +156,22 @@ public function getVersion(): string
     }
 
     /**
-     * @return PendingRequest
+     * @return PendingRequest|null
      */
-    public function getConnection(): PendingRequest
+    public function getConnection(): ?PendingRequest
     {
         return $this->connection;
     }
+
+    /**
+     * Checks if given version for notion-api is valid
+     *
+     * @param string $version
+     */
+    public function checkValidVersion(string $version): void
+    {
+        if (!$this->validVersions->contains($version)) {
+            throw WrapperException::instance("invalid version for notion-api", ['invalidVersion' => $version]);
+        }
+    }
 }