🍺 Pint

composer.json

@@ -29,7 +29,8 @@
         "phpstan/phpstan": "^1.8",
         "pestphp/pest": "^2.6",
         "orchestra/testbench": "^8.5",
-        "directorytree/ldaprecord": "^3.7"
+        "directorytree/ldaprecord": "^3.7",
+        "laravel/pint": "^1.20"
     },
     "config": {
         "allow-plugins": {

config/forward-authentication.php

@@ -34,7 +34,7 @@
             'driver' => 'http',
 
             'address' => env('STATAMIC_FORWARD_AUTH_HTTP_ADDRESS'),
-    
+
             'response' => [
                 'success' => 'result',
                 'name' => 'data.name',
@@ -50,15 +50,15 @@
             ],
 
             'port' => env('STATAMIC_FORWARD_AUTH_LDAP_PORT', 389),
-            
+
             'use_ssl' => env('STATAMIC_FORWARD_AUTH_LDAP_SSL', false),
-    
+
             'base_dn' => env('STATAMIC_FORWARD_AUTH_BASE_DN'),
-    
+
             'username' => env('STATAMIC_FORWARD_AUTH_BIND_USERNAME'),
-    
+
             'password' => env('STATAMIC_FORWARD_AUTH_BIND_PASSWORD'),
-            
+
             'queryCallback' => fn (Connection $connection, array $credentials) => $connection->query()->where('mail', '=', $credentials['email'])->first(),
         ],
 

src/AuthServices/AuthServiceContract.php

@@ -7,6 +7,6 @@ interface AuthServiceContract
     public function checkCredentialsAgainstForwardAuth(array $credentials): array|false;
 
     public function credentialsValidAgainstForwardAuth(): bool;
-    
+
     public function userData(): array;
-}
+}

src/AuthServices/HttpAuthService.php

@@ -8,27 +8,33 @@
 class HttpAuthService implements AuthServiceContract
 {
     protected $config;
+
     protected $data;
+
     protected $forwardAuthUser = false;
 
-    public function __construct() {
+    public function __construct()
+    {
         $service = config('statamic.forward-authentication.default');
         $this->config = config("statamic.forward-authentication.services.$service");
-        $this->data = config("statamic.forward-authentication.data");
+        $this->data = config('statamic.forward-authentication.data');
     }
 
-    public function checkCredentialsAgainstForwardAuth(array $credentials): array|false {
+    public function checkCredentialsAgainstForwardAuth(array $credentials): array|false
+    {
         return $this->forwardAuthUser = Http::post($this->config['address'], $credentials)->json();
     }
 
-    public function credentialsValidAgainstForwardAuth(): bool {
+    public function credentialsValidAgainstForwardAuth(): bool
+    {
         return Arr::get($this->forwardAuthUser, $this->config['response']['success']);
     }
 
-    public function userData(): array {
+    public function userData(): array
+    {
         return array_merge($this->data, [
             'name' => Arr::get($this->forwardAuthUser, $this->config['response']['name']),
             'forward_auth' => true,
         ]);
     }
-}
+}

src/AuthServices/LdapAuthService.php

@@ -2,27 +2,30 @@
 
 namespace Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices;
 
-use LdapRecord\Connection;
 use Daynnnnn\Statamic\Auth\ForwardAuth\Exceptions\LdapRecordNotFoundException;
-use Illuminate\Support\Arr;
+use LdapRecord\Connection;
 
 class LdapAuthService implements AuthServiceContract
 {
     protected $config;
+
     protected $data;
+
     protected $forwardAuthUser = false;
 
-    public function __construct() {
-        if (!class_exists(Connection::class)) {
-            throw new LdapRecordNotFoundException("Using the LDAP service requires the LdapRecord package", 1);
+    public function __construct()
+    {
+        if (! class_exists(Connection::class)) {
+            throw new LdapRecordNotFoundException('Using the LDAP service requires the LdapRecord package', 1);
         }
 
         $service = config('statamic.forward-authentication.default');
         $this->config = config("statamic.forward-authentication.services.$service");
-        $this->data = config("statamic.forward-authentication.data");
+        $this->data = config('statamic.forward-authentication.data');
     }
 
-    public function checkCredentialsAgainstForwardAuth(array $credentials): array|false {
+    public function checkCredentialsAgainstForwardAuth(array $credentials): array|false
+    {
         $connectionConfig = [
             'hosts' => $this->config['hosts'],
             'port' => $this->config['port'],
@@ -54,19 +57,21 @@ public function checkCredentialsAgainstForwardAuth(array $credentials): array|fa
 
             $userConnection->connect();
 
-            // Connection will throw an exception if it fails, so if we get to 
+            // Connection will throw an exception if it fails, so if we get to
             // this step then set the forwardAuthUser to the returned user
             $this->forwardAuthUser = $user;
         } finally {
             return $this->forwardAuthUser;
         }
     }
 
-    public function credentialsValidAgainstForwardAuth(): bool {
+    public function credentialsValidAgainstForwardAuth(): bool
+    {
         return $this->forwardAuthUser !== false;
     }
 
-    public function userData(): array {
+    public function userData(): array
+    {
         return array_merge($this->data, [
             'name' => $this->forwardAuthUser['displayname'][0],
             'forward_auth' => true,

src/Exceptions/LdapRecordNotFoundException.php

@@ -3,13 +3,12 @@
 namespace Daynnnnn\Statamic\Auth\ForwardAuth\Exceptions;
 
 use Exception;
-use Facade\IgnitionContracts\Solution;
 use Facade\IgnitionContracts\BaseSolution;
 use Facade\IgnitionContracts\ProvidesSolution;
+use Facade\IgnitionContracts\Solution;
 
 class LdapRecordNotFoundException extends Exception implements ProvidesSolution
 {
-    /** @return  \Facade\IgnitionContracts\Solution */
     public function getSolution(): Solution
     {
         return BaseSolution::create('Install LdapRecord')

src/ForwardAuthServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Daynnnnn\Statamic\Auth\ForwardAuth;
 
-use Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices;
 use Illuminate\Support\Facades\Auth;
 use Statamic\Providers\AddonServiceProvider;
 
@@ -15,6 +14,7 @@ public function register()
         $this->app->bind(AuthServices\AuthServiceContract::class, function () {
             $service = config('statamic.forward-authentication.default');
             $class = $this->lookupType(config("statamic.forward-authentication.services.$service.driver"));
+
             return new $class;
         });
     }
@@ -30,7 +30,8 @@ public function boot()
         });
     }
 
-    protected function lookupType($type) {
+    protected function lookupType($type)
+    {
         $types = [
             'http' => AuthServices\HttpAuthService::class,
             'ldap' => AuthServices\LdapAuthService::class,

src/ForwardAuthUserProvider.php

@@ -18,10 +18,10 @@ public function retrieveByCredentials(array $credentials)
 
             if (AuthService::credentialsValidAgainstForwardAuth()) {
                 return User::make()
-                        ->email($credentials['email'])
-                        ->password($credentials['password'])
-                        ->data(AuthService::userData())
-                        ->save();
+                    ->email($credentials['email'])
+                    ->password($credentials['password'])
+                    ->data(AuthService::userData())
+                    ->save();
             }
         }
 
@@ -35,9 +35,9 @@ public function validateCredentials(Authenticatable $user, array $credentials)
         if ($user->forward_auth === true) {
             AuthService::checkCredentialsAgainstForwardAuth($credentials);
 
-            if (!AuthService::credentialsValidAgainstForwardAuth()) {
+            if (! AuthService::credentialsValidAgainstForwardAuth()) {
                 $localCredentialsValid = false;
-            } elseif (!$localCredentialsValid) {
+            } elseif (! $localCredentialsValid) {
                 $user->password($credentials['password'])->save();
                 $localCredentialsValid = true;
             }

tests/Feature/ForwardAuthUserProviderTest.php

@@ -1,17 +1,8 @@
 <?php
 
 use Daynnnnn\Statamic\Auth\ForwardAuth\ForwardAuthUserProvider;
-use Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices\AuthServiceContract;
-use Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices\HttpAuthService;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Http;
-use Statamic\Auth\File\UserGroupRepository as FileUserGroupRepository;
 use Statamic\Facades\User;
-use Statamic\Contracts\Auth\UserGroupRepository;
-use Statamic\Contracts\Auth\UserRepository;
-use Statamic\Stache\Stache;
-use Statamic\Stache\Stores\UsersStore;
-use Statamic\Stache\Repositories\UserRepository as StacheUserRepository;
 
 test('creates user if not found locally and is valid against forward authentication', function () {
     $forwardAuthUser = setupHttpAuthService(true);

tests/Feature/HttpAuthServiceTest.php

@@ -18,7 +18,7 @@
     $this->assertEquals($mockRepsonse, $forwardAuthUser->checkCredentialsAgainstForwardAuth($credentials));
 });
 
-test('credentialsValidAgainstForwardAuth returns true with valid user', function() {
+test('credentialsValidAgainstForwardAuth returns true with valid user', function () {
     $credentials = [
         'email' => '[email protected]',
         'password' => 'supersecure',
@@ -29,7 +29,7 @@
     $this->assertTrue($forwardAuthUser->credentialsValidAgainstForwardAuth());
 });
 
-test('userData returns expected data array', function() {
+test('userData returns expected data array', function () {
     $expectedData = [
         'super' => true,
         'forward_auth' => true,
@@ -44,4 +44,4 @@
     $forwardAuthUser = tap(setupHttpAuthService(true))->checkCredentialsAgainstForwardAuth($credentials);
 
     $this->assertEquals($expectedData, $forwardAuthUser->userData());
-});
+});

tests/Pest.php

@@ -42,7 +42,8 @@
 |
 */
 
-function setupHttpAuthService($status) {
+function setupHttpAuthService($status)
+{
     $mockRepsonse = [
         'success' => $status,
         'data' => [
@@ -60,7 +61,7 @@ function setupHttpAuthService($status) {
                     'success' => 'success',
                     'name' => 'data.name',
                 ],
-            ]
+            ],
         ],
         'data' => [
             'super' => true,
@@ -70,11 +71,11 @@ function setupHttpAuthService($status) {
     $authConfig = [
         'driver' => 'forward',
     ];
-    
+
     config(['statamic.forward-authentication' => $forwardAuthConfig]);
     config(['auth.providers.users' => $authConfig]);
 
     Http::fake(Http::response($mockRepsonse, 200));
 
     return new HttpAuthService;
-}
+}

tests/TestCase.php

@@ -2,20 +2,10 @@
 
 namespace Daynnnnn\Statamic\Auth\ForwardAuth\Tests;
 
-use Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices\AuthServiceContract;
-use Daynnnnn\Statamic\Auth\ForwardAuth\AuthServices\HttpAuthService;
 use Orchestra\Testbench\TestCase as BaseTestCase;
-use Statamic\Auth\File\UserGroupRepository as FileUserGroupRepository;
-use Statamic\Contracts\Auth\UserGroupRepository;
-use Statamic\Contracts\Auth\UserRepository;
-use Statamic\Facades\Stache;
-use Statamic\Stache\Stores\UsersStore;
-use Statamic\Stache\Repositories\UserRepository as StacheUserRepository;
-use Statamic\Facades\UserGroup;
 
 class TestCase extends BaseTestCase
 {
-
     protected function getPackageProviders($app)
     {
         return [
@@ -30,4 +20,4 @@ protected function setUp(): void
 
         config(['statamic.users.repository' => 'file']);
     }
-}
+}