WIP

Author: stevebauman

README.md

@@ -91,8 +91,8 @@ class AuthServiceProvider extends ServiceProvider
 
     public function boot()
     {
-        Bartender::registerProvider('google');
-        Bartender::registerProvider('microsoft');
+        Bartender::serve('google');
+        Bartender::serve('microsoft');
     }
 }
 ```
@@ -111,7 +111,7 @@ class AuthServiceProvider extends ServiceProvider
 
     public function boot()
     {
-        Bartender::useUserModel(User::class);
+        Bartender::setUserModel(User::class);
     }
 }
 ```
@@ -137,13 +137,13 @@ route, and the users account will automatically be created or updated.
 
 Almost everything can be swapped out in Bartender.
 
-
-If you would like to handle everything yourself for redirects and callbacks, you may create your own `ProviderHandler`:
+If you would like to handle everything yourself for OAuth redirects and callbacks, you may create your own `ProviderHandler`:
 
 ```php
 namespace App\Socialite;
 
 use Illuminate\Http\Request;
+use Laravel\Socialite\Contracts\Provider;
 use DirectoryTree\Bartender\ProviderHandler;
 
 class UserProviderHandler implements ProviderHandler
@@ -176,14 +176,32 @@ class UserProviderHandler implements ProviderHandler
         return redirect()->route('dashboard');
     }
 }
-
 ```
 
+Then, provide it into the second argument in the `Bartender::serve` method:
+
+```php
+// app/Providers/AuthServiceProvider.php
+
+use App\Socialite\UserProviderHandler;
+use DirectoryTree\Bartender\Facades\Bartender;
+
+class AuthServiceProvider extends ServiceProvider
+{
+    // ...
+
+    public function boot()
+    {
+        Bartender::serve('google', UserProviderHandler::class);
+        Bartender::serve('microsoft', UserProviderHandler::class);
+    }
+}
+```
 
 ### User Creation & Updating
 
-If you would like to customize the creation of the user provider, you can create your own
-`UserProvider` implementation:
+If you would like to customize the creation of the user in the default
+handler, you may create your own `ProviderRepository` implementation:
 
 ```php
 namespace App\Socialite;
@@ -233,8 +251,9 @@ class AppServiceProvider extends ServiceProvider
 
 ### User Redirects & Flash Messaging
 
-If you would like to customize the behavior of the redirects and flash messages depending
-on the outcome of a OAuth callback, you can create your own `ProviderRedirector` implementation:
+If you would like to customize the behavior of the redirects of the default 
+redirector and flash messages depending on the outcome of a OAuth callback, 
+you can create your own `ProviderRedirector` implementation:
 
 ```php
 namespace App\Socialite;

composer.json

@@ -12,7 +12,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=8.0",
+    "php": ">=8.0",
         "illuminate/support": "^9.0|^10.0|^11.0",
         "laravel/socialite": "^5.0"
     },

src/BartenderManager.php

@@ -23,25 +23,25 @@ class BartenderManager
     /**
      * Set the user model class name.
      */
-    public function useUserModel(string $userModel): void
+    public function setUserModel(string $userModel): void
     {
         $this->userModel = $userModel;
     }
 
     /**
      * Get a new user model instance.
      */
-    public function user(): Model
+    public function getUserModel(): string
     {
-        return new $this->userModel;
+        return $this->userModel;
     }
 
     /**
-     * Register a new driver handler.
+     * Register a new driver handler to serve.
      *
      * @param class-string $handler
      */
-    public function register(string $driver, string $handler = UserProviderHandler::class): void
+    public function serve(string $driver, string $handler = UserProviderHandler::class): void
     {
         $this->handlers[$driver] = $handler;
     }

src/Controllers/AuthController.php

@@ -3,19 +3,10 @@
 namespace DirectoryTree\Bartender\Controllers;
 
 use Illuminate\Http\RedirectResponse;
-use DirectoryTree\Bartender\BartenderManager;
 use DirectoryTree\Bartender\Facades\Bartender;
 
 class AuthController
 {
-    /**
-     * Constructor.
-     */
-    public function __construct(
-        protected BartenderManager $manager
-    ) {
-    }
-
     /**
      * Handle redirecting the user to the OAuth provider.
      */

src/Facades/Bartender.php

@@ -7,9 +7,10 @@
 
 /**
  * @method static void routes()
- * @method static void useUserModel(string $userModel)
- * @method static \Illuminate\Database\Eloquent\Model user()
- * @method static void register(string $driver, string $handler)
+ * @method static array handlers()
+ * @method static string getUserModel()
+ * @method static void setUserModel(string $userModel)
+ * @method static void serve(string $driver, string $handler)
  * @method static \Illuminate\Http\RedirectResponse redirect(string $driver)
  * @method static \Illuminate\Http\RedirectResponse callback(string $driver)
  */

src/UserProviderHandler.php

@@ -4,7 +4,6 @@
 
 use Exception;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Facades\Auth;
 use Laravel\Socialite\Contracts\Provider;
 use Laravel\Socialite\Two\User as SocialiteUser;
 

src/UserProviderRepository.php

@@ -18,7 +18,7 @@ class UserProviderRepository implements ProviderRepository
      */
     public function exists(string $driver, SocialiteUser $user): bool
     {
-        return $this->newUserQuery(Bartender::user())
+        return $this->newUserQuery(Bartender::getUserModel())
             ->where('email', '=', $user->email)
             ->where(fn (Builder $query) => (
                 $query
@@ -33,7 +33,7 @@ public function exists(string $driver, SocialiteUser $user): bool
      */
     public function updateOrCreate(string $driver, SocialiteUser $user): Authenticatable
     {
-        $model = Bartender::user();
+        $model = Bartender::getUserModel();
 
         $eloquent = $this->newUserQuery($model)->firstOrNew([
             'email' => $user->email,
@@ -60,28 +60,30 @@ public function updateOrCreate(string $driver, SocialiteUser $user): Authenticat
 
     /**
      * Get a new user query instance.
+     *
+     * @param class-string $model
      */
-    protected function newUserQuery(Model $model): Builder
+    protected function newUserQuery(string $model): Builder
     {
         if ($this->isUsingSoftDeletes($model)) {
-            return $model->withTrashed();
+            return $model::withTrashed();
         }
 
-        return $model->newQuery();
+        return $model::query();
     }
 
     /**
      * Determine if the given model uses soft deletes.
      */
-    protected function isUsingSoftDeletes(Model $model): bool
+    protected function isUsingSoftDeletes(string $model): bool
     {
         return in_array(SoftDeletes::class, class_uses_recursive($model));
     }
 
     /**
      * Determine if the given model is verifying emails.
      */
-    protected function isVerifyingEmails(Model $model): bool
+    protected function isVerifyingEmails(string $model): bool
     {
         return in_array(MustVerifyEmail::class, class_uses_recursive($model));
     }

tests/BartenderManagerTest.php

@@ -7,17 +7,17 @@
 test('it can register handlers', function () {
     $manager = new BartenderManager();
 
-    $manager->register('foo', stdClass::class);
+    $manager->serve('foo', stdClass::class);
 
     expect($manager->handlers())->toBe(['foo' => stdClass::class]);
 });
 
 test('it returns new user model', function () {
     $manager = new BartenderManager();
 
-    $manager->useUserModel(User::class);
+    $manager->setUserModel(User::class);
 
-    expect($manager->user())->toBeInstanceOf(User::class);
+    expect($manager->getUserModel())->toBe(User::class);
 });
 
 test('it is bound to facade', function () {

tests/UserProviderQueryTest.php

@@ -6,7 +6,7 @@
 use Illuminate\Database\UniqueConstraintViolationException;
 use Laravel\Socialite\Two\User as SocialiteUser;
 
-beforeEach(fn () => Bartender::useUserModel(User::class));
+beforeEach(fn () => Bartender::setUserModel(User::class));
 
 it('determines if user already exists with a different provider', function () {
     $socialite = tap(new SocialiteUser(), function ($user) {