Use bind on contract, add facade

Daynnnnn · Aug 4, 2021 · 08dcc2d · 08dcc2d
1 parent be736cf
commit 08dcc2d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/src/Facades/AuthService.php b/src/Facades/AuthService.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Daynnnnn\Statamic\Auth\ForwardAuth\Facades;
+
+use Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices\AuthServiceContract;
+use Illuminate\Support\Facades\Facade;
+
+class AuthService extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return AuthServiceContract::class;
+    }
+}
diff --git a/src/ForwardAuthServiceProvider.php b/src/ForwardAuthServiceProvider.php
@@ -8,11 +8,18 @@
 
 class ForwardAuthServiceProvider extends AddonServiceProvider
 {
+    public function register()
+    {
+        $this->app->bind(AuthServices\AuthServiceContract::class, function () {
+            $class = $this->lookupType(config('auth.providers.users.type'));
+            return new $class;
+        });
+    }
+
     public function boot()
     {
         Auth::provider('forward', function () {
-            $class = $this->lookupType(config('auth.providers.users.type'));
-            return new ForwardAuthUserProvider(new $class);
+            return new ForwardAuthUserProvider;
         });
     }
 

diff --git a/src/ForwardAuthUserProvider.php b/src/ForwardAuthUserProvider.php
@@ -2,7 +2,7 @@
 
 namespace Daynnnnn\Statamic\Auth\ForwardAuth;
 
-use Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices\AuthServiceContract;
+use Daynnnnn\Statamic\Auth\ForwardAuth\Facades\AuthService;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider as UserProviderContract;
 use Illuminate\Support\Facades\Hash;
@@ -11,22 +11,16 @@
 
 class ForwardAuthUserProvider extends UserProvider implements UserProviderContract
 {
-    protected $authService;
-
-    public function __construct(AuthServiceContract $authService) {
-        $this->authService = $authService;
-    }
-
     public function retrieveByCredentials(array $credentials)
     {
         if (($user = User::findByEmail($credentials['email'])) === null) {
-            $this->authService->checkCredentialsAgainstForwardAuth($credentials);
+            AuthService::checkCredentialsAgainstForwardAuth($credentials);
 
-            if ($this->authService->credentialsValidAgainstForwardAuth()) {
+            if (AuthService::credentialsValidAgainstForwardAuth()) {
                 return User::make()
                         ->email($credentials['email'])
                         ->password($credentials['password'])
-                        ->data($this->authService->userData())
+                        ->data(AuthService::userData())
                         ->save();
             }
         }
@@ -39,9 +33,9 @@ public function validateCredentials(Authenticatable $user, array $credentials)
         $localCredentialsValid = Hash::check($credentials['password'], $user->getAuthPassword());
 
         if ($user->forward_auth === true) {
-            $this->authService->checkCredentialsAgainstForwardAuth($credentials);
+            AuthService::checkCredentialsAgainstForwardAuth($credentials);
 
-            if (!$this->authService->credentialsValidAgainstForwardAuth()) {
+            if (!AuthService::credentialsValidAgainstForwardAuth()) {
                 $localCredentialsValid = false;
             } elseif (!$localCredentialsValid) {
                 $user->password($credentials['password'])->save();