Merge pull request #29 from benlumley/master

Fix for null argument to lifetime not being considered.

Author: cesargb

src/MagicLink.php

@@ -128,7 +128,11 @@ public static function getValidMagicLinkByToken($token)
 
         return self::where('id', $tokenId)
                     ->where('token', $tokenSecret)
-                    ->where('available_at', '>=', Carbon::now())
+                    ->where(function ($query) {
+                        $query
+                            ->whereNull('available_at')
+                            ->orWhere('available_at', '>=', Carbon::now());
+                    })
                     ->where(function ($query) {
                         $query
                             ->whereNull('max_visits')

tests/MagicLinkTest.php

@@ -57,6 +57,14 @@ public function test_fails_when_date_is_expired()
                 ->assertStatus(403);
     }
 
+    public function test_ok_when_date_is_null()
+    {
+        $magiclink = MagicLink::create(new LoginAction(User::first()), null);
+
+        $this->get($magiclink->url)
+             ->assertStatus(302);
+    }
+
     public function test_fail_when_max_visits_completed()
     {
         $magiclink = MagicLink::create(new LoginAction(User::first()));