wip

src/Http/Controllers/Auth/ResetPasswordController.php

@@ -2,8 +2,8 @@
 
 namespace Cone\Root\Http\Controllers\Auth;
 
-use App\Models\User;
 use Cone\Root\Http\Controllers\Controller;
+use Cone\Root\Models\User;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Http\RedirectResponse;

src/Resources/Resource.php

@@ -387,20 +387,28 @@ public function paginate(Request $request): LengthAwarePaginator
             ->paginate($request->input($this->getPerPageKey()))
             ->withQueryString()
             ->through(function (Model $model) use ($request): array {
-                return [
-                    'id' => $model->getKey(),
-                    'url' => $this->modelUrl($model),
-                    'model' => $model,
-                    'abilities' => $this->mapModelAbilities($request, $model),
-                    'fields' => $this->resolveFields($request)
-                        ->subResource(false)
-                        ->authorized($request, $model)
-                        ->visible('index')
-                        ->mapToDisplay($request, $model),
-                ];
+                return $this->mapModel($request, $model);
             });
     }
 
+    /**
+     * Map the model.
+     */
+    public function mapModel(Request $request, Model $model): array
+    {
+        return [
+            'id' => $model->getKey(),
+            'url' => $this->modelUrl($model),
+            'model' => $model,
+            'abilities' => $this->mapModelAbilities($request, $model),
+            'fields' => $this->resolveFields($request)
+                ->subResource(false)
+                ->authorized($request, $model)
+                ->visible('index')
+                ->mapToDisplay($request, $model),
+        ];
+    }
+
     /**
      * Handle the request.
      */

tests/Http/ForgotPasswordControllerTest.php

@@ -2,9 +2,9 @@
 
 namespace Cone\Root\Tests\Http;
 
+use Cone\Root\Notifications\ResetPassword;
 use Cone\Root\Tests\TestCase;
 use Cone\Root\Tests\User;
-use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Support\Facades\Notification;
 
 class ForgotPasswordControllerTest extends TestCase
@@ -31,6 +31,6 @@ public function test_forgot_password_controller_handles_password_reset_request()
         ])->assertRedirect()
             ->assertSessionDoesntHaveErrors();
 
-        Notification::assertNothingSentTo($user);
+        Notification::assertSentTo($user, ResetPassword::class);
     }
 }

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace Cone\Root\Tests;
 
+use Cone\Root\Interfaces\Models\User as UserInterface;
 use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Illuminate\Support\Facades\Storage;
@@ -17,6 +18,8 @@ public function setUp(): void
 
         $this->app['router']->getRoutes()->refreshNameLookups();
 
+        $this->app->bind(UserInterface::class, User::class);
+
         $this->startSession();
 
         $this->app['request']->setLaravelSession($this->app['session']);
@@ -30,5 +33,6 @@ public function setUp(): void
 
         $this->app['config']->set('root.media.tmp_dir', Storage::disk('local')->path('root-tmp'));
         $this->app['config']->set('root.media.chunk_expiration', 0);
+        $this->app['config']->set('auth.providers.users.model', User::class);
     }
 }