Cesargb patch 1

.gitignore

@@ -2,3 +2,4 @@
 /build
 composer.lock
 .phpunit.result.cache
+.idea

src/MagicLink.php

@@ -19,7 +19,7 @@ public function add($user, $redirect_url = '', $lifetime = 0)
         if (is_int($user)) {
             $MagicLink->user_id = $user;
         } else {
-            $MagicLink->user_id = $user->id;
+            $MagicLink->user_id = $user->getKey();
         }
 
         $MagicLink->token = Str::random(config('magiclink.token.length', 64));
@@ -51,12 +51,20 @@ public function auth($token)
                     ->first();
 
         if ($magicLink) {
-            $user = config('auth.providers.users.model')::find($magicLink->user_id);
+
+            $authProvider = "auth.providers." . config('magiclink.auth_provider').".model";
+
+            $user = config($authProvider)::find($magicLink->user_id);
 
             if ($user) {
-                app()->make('auth')->loginUsingId($magicLink->user_id);
+                app()->make('auth')->guard(config('magiclink.auth_guard'))->loginUsingId($magicLink->user_id);
+
+                //invalidating link after clicked once
+                $magicLink->available_at = Carbon::now()->subMinute();
+                $magicLink->save();
 
                 if ($magicLink->redirect_url !== null && $magicLink->redirect_url != '') {
+
                     return $magicLink->redirect_url;
                 }
 

src/Models/MagicLink.php

@@ -8,6 +8,6 @@ class MagicLink extends Model
 {
     public function user()
     {
-        return $this->hasOne(config('auth.providers.users.model'), config('magiclink.user_primarykey', 'id'), 'users_id');
+        return $this->hasOne(config(config('magicklink.auth_provider').'.model'), config('magiclink.user_primarykey', 'id'), 'users_id');
     }
 }

src/config/magiclink.php

@@ -1,6 +1,21 @@
 <?php
 
 return [
+     /*
+    |--------------------------------------------------------------------------
+    | Application auth provider
+    |--------------------------------------------------------------------------
+    |
+    | By default users is auth provider (can be found at config/auth with providers key).
+    | If you want magick link for other auth guard you can change that here.
+    | 
+    |
+    */
+
+    'auth_provider' => 'users', 
+
+    'auth_guard' => 'web',  
+
     /*
     |--------------------------------------------------------------------------
     | Application magiclink Table

tests/TestCase.php

@@ -40,6 +40,7 @@ protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('app.key', 'base64:mJlbzP1TMXUPouK3KK6e9zS/VvxtWTfzfVlkn1JTqpM=');
         $app['config']->set('auth.providers.users.model', 'Cesargb\MagicLink\Test\User');
+        $app['config']->set('magiclink.auth_provider', 'users');
         $app['config']->set('database.default', 'sqlite');
         $app['config']->set('database.connections.sqlite', [
             'driver'   => 'sqlite',