wip

Author: SjorsO

app/Console/Commands/InviteUserCommand.php

@@ -38,7 +38,7 @@ public function handle()
             ]);
 
             $user->passwordResetToken()->create([
-                'hashed_token' => $token = Str::uuid()->toString(),
+                'hashed_token' => $token = str_uuid(),
                 'expires_at' => now()->addDays(7)->endOfDay(),
             ]);
 

app/Http/Controllers/Guest/RequestPasswordResetController.php

@@ -7,7 +7,6 @@
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Str;
 
 class RequestPasswordResetController
 {
@@ -41,7 +40,7 @@ public function post(Request $request)
 
         PasswordResetToken::create([
             'user_id' => $user->id,
-            'hashed_token' => $token = Str::uuid()->toString(),
+            'hashed_token' => $token = str_uuid(),
             'expires_at' => now()->addHours(4),
         ]);
 

app/Models/User.php

@@ -11,7 +11,6 @@ class User extends Authenticatable
     use HasFactory, Notifiable;
 
     protected $casts = [
-        'email_verified_at' => 'datetime',
         'password' => 'hashed',
         'last_seen_at' => 'datetime',
     ];

database/factories/ApplicationFactory.php

@@ -6,15 +6,14 @@
 use App\Models\ApplicationAlertPreference;
 use App\Models\Server;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
 
 class ApplicationFactory extends Factory
 {
     public function definition(): array
     {
         return [
             'server_id' => Server::factory(),
-            'uuid' => $uuid = Str::uuid()->toString(),
+            'uuid' => $uuid = str_uuid(),
             'slug' => $uuid,
             'name' => 'The Application Name',
             'env' => 'production',

database/factories/ServerFactory.php

@@ -5,14 +5,13 @@
 use App\Models\Server;
 use App\Models\ServerAlertPreference;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
 
 class ServerFactory extends Factory
 {
     public function definition(): array
     {
         return [
-            'uuid' => $uuid = Str::uuid()->toString(),
+            'uuid' => $uuid = str_uuid(),
             'slug' => $uuid,
             'name' => 'The Server Name',
             'os' => 'Ubuntu',

database/factories/UserFactory.php

@@ -15,7 +15,7 @@ public function definition(): array
     {
         return [
             'first_name' => Arr::random(['Hank', 'Bill', 'Dale', 'Bobby', 'John']),
-            'email' => Str::uuid()->toString().'@example.com',
+            'email' => str_uuid().'@example.com',
             'password' => '$2y$04$HmysXLhjC2gcCrM0eNEyXeL1G3SDwdEGlFmB3RdZzWfdAWymQeN7m',
             'last_seen_at' => now(),
             'remember_token' => Str::random(10),

tests/Unit/Controllers/LoginControllerTest.php

@@ -2,82 +2,62 @@
 
 namespace Tests\Unit\Controllers;
 
-use Illuminate\Testing\TestResponse;
+use App\Models\User;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class LoginControllerTest extends TestCase
 {
-    public function settingUp(): void
-    {
-        parent::settingUp();
-
-        $this->markTestSkipped();
-    }
-
     #[Test]
-    public function it_can_show_the_login_page(): void
+    public function it_can_show_the_login_page()
     {
         $this->showLogin()->assertStatus(200);
     }
 
     #[Test]
-    public function it_redirects_guests(): void
+    public function it_redirects_guests()
     {
-        $this->userLogin()
+        $user = User::factory()->create();
+
+        $this->actingAs($user)
             ->showLogin()
-            ->assertRedirect(route('runs.index'));
+            ->assertRedirect(route('dashboard'));
     }
 
     #[Test]
-    public function it_can_login_a_user(): void
+    public function it_can_login_a_user()
     {
-        $user = factory()->user();
+        $user = User::factory()->create();
 
         $this->assertGuest();
 
         $this->postLogin(['email' => $user->email, 'password' => 'password'])
             ->assertSessionDoesntHaveErrors()
-            ->assertRedirect(route('runs.index'));
+            ->assertRedirect(route('dashboard'));
 
         $this->assertAuthenticatedAs($user);
     }
 
     #[Test]
-    public function you_have_to_verify_your_email_before_you_can_login(): void
-    {
-        $user = factory()->user();
-
-        $user->update(['email_verified_at' => null]);
-
-        $this->postLogin(['email' => $user->email, 'password' => 'password'])
-            ->assertSessionHasErrors('email')
-            ->assertStatus(302);
-
-        $this->assertGuest();
-    }
-
-    #[Test]
-    public function it_can_fail_a_login(): void
+    public function it_can_fail_a_login()
     {
-        $user = factory()->user();
+        $user = User::factory()->create();
 
         $this->assertGuest();
 
-        $this->postLogin(['email' => $user->email, 'password' => 'wrong!!!'])
+        $this->postLogin(['email' => $user->email, 'password' => 'wrong'])
             ->assertStatus(302)
             ->assertSessionHasErrors();
 
         $this->assertGuest();
     }
 
-    private function showLogin(): TestResponse
+    private function showLogin()
     {
         return $this->get(route('login'));
     }
 
-    // @phpstan-ignore-next-line
-    private function postLogin(array $data): TestResponse
+    private function postLogin(array $data)
     {
         return $this->post(route('login'), $data);
     }

tests/Unit/Controllers/ReceiveBundleControllerTest.php

@@ -174,8 +174,8 @@ public function it_creates_a_pending_alert_if_supervisor_is_not_all_running()
         $postBundle = function () {
             Server::receiveBundle($this->fixtureBundle1()->put([
                 'server/supervisor-status' => <<<'STRING'
-                all-organizations-database-queue:all-organizations-database-queue_01                                                         FATAL     Exited too quickly (process log may have details)
-                aaaaaaaaaaaaaa-aaaaa-aaaaaaa-aaaaa-horizon:aaaaaaaaaaaaaa-aaaaa-aaaaaaa-aaaaa-horizon_00                                     RUNNING   pid 174708, uptime 2 days, 0:01:25
+                all-organizations-database-queue:all-organizations-database-queue_01                         FATAL     Exited too quickly (process log may have details)
+                aaaaaaaaaaaaaa-aaaaa-aaaaaaa-aaaaa-horizon:aaaaaaaaaaaaaa-aaaaa-aaaaaaa-aaaaa-horizon_00     RUNNING   pid 174708, uptime 2 days, 0:01:25
                 STRING,
             ])->get());
         };

tests/Unit/Controllers/RequestPasswordResetControllerTest.php

@@ -3,119 +3,108 @@
 namespace Tests\Unit\Controllers;
 
 use App\Mail\PasswordResetMail;
+use App\Models\PasswordResetToken;
 use App\Models\User;
-use Carbon\CarbonInterface;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Str;
 use Illuminate\Testing\TestResponse;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class RequestPasswordResetControllerTest extends TestCase
 {
-    public function settingUp(): void
-    {
-        parent::settingUp();
-
-        $this->markTestSkipped();
-    }
-
     #[Test]
-    public function it_can_show_the_request_page(): void
+    public function it_can_show_the_request_page()
     {
-        $this->showRequestPage()->assertStatus(200);
+        $this->get(route('login.requestPassword'))->assertStatus(200);
     }
 
     #[Test]
-    public function it_can_show_the_success_page(): void
+    public function it_can_show_the_success_page()
     {
-        $this->showSuccessPage()->assertStatus(200);
+        $this->get(route('login.requestPassword.success'))->assertStatus(200);
     }
 
     #[Test]
-    public function it_can_request_a_reset(): void
+    public function it_can_request_a_reset()
     {
         Mail::fake();
 
-        $user = factory()->user();
+        $user = User::factory()->create();
 
         $this->postRequestReset($user->email)
             ->assertSessionHasNoErrors()
             ->assertRedirect(route('login.requestPassword.success'));
 
-        $record = DB::table('password_resets')->where('email', $user->email)->first();
+        $this->assertSame(1, PasswordResetToken::count());
+        $token = PasswordResetToken::firstWhere('user_id', $user->id);
 
-        throw_if(! isset($record->token), '(message for Larastan)');
-
-        $this->assertNotNull($record->token);
+        $this->assertTrue($token->expires_at->isFuture());
 
         Mail::assertQueued(PasswordResetMail::class, 1);
         Mail::assertQueued(fn (PasswordResetMail $email) => $email->user->id === $user->id);
     }
 
     #[Test]
-    public function you_cant_request_a_reset_if_you_have_not_verified_your_email(): void
-    {
-        $user = factory()->user();
-
-        $user->update(['email_verified_at' => null]);
-
-        $this->postRequestReset($user->email)
-            ->assertSessionHasErrors('email')
-            ->assertStatus(302);
-    }
-
-    #[Test]
-    public function it_throttles_reset_requests(): void
+    public function it_throttles_reset_requests()
     {
         Mail::fake();
 
-        $user = factory()->user();
+        $user = User::factory()->create();
 
-        $this->createToken($user, now()->subMinutes(5));
+        $token = PasswordResetToken::create([
+            'user_id' => $user->id,
+            'hashed_token' => str_uuid(),
+            'expires_at' => now()->addHours(4),
+            'created_at' => now()->subMinutes(15),
+        ]);
 
         $this->postRequestReset($user->email)
             ->assertSessionHasErrors(['email' => 'You already requested a password reset recently'])
             ->assertStatus(302);
 
+        $this->assertModelExists($token);
+
         Mail::assertNothingOutgoing();
     }
 
     #[Test]
-    public function it_updates_existing_tokens(): void
+    public function it_updates_existing_tokens()
     {
         Mail::fake();
 
-        $user = factory()->user();
+        $user = User::factory()->create();
 
-        [$email, $token] = $this->createToken($user, now()->subHours(2));
+        $token = PasswordResetToken::create([
+            'user_id' => $user->id,
+            'hashed_token' => str_uuid(),
+            'expires_at' => now()->subHours(4),
+            'created_at' => now()->subMinutes(120),
+        ]);
 
         $this->postRequestReset($user->email)
             ->assertSessionHasNoErrors()
             ->assertRedirect(route('login.requestPassword.success'));
 
-        $record = DB::table('password_resets')->where('email', $user->email)->first();
+        $this->assertModelMissing($token);
 
-        throw_if(! isset($record->token), '(message for Larastan)');
-
-        $this->assertNotSame($record->token, $token);
+        $this->assertNotNull($user->passwordResetToken);
+        $this->assertTrue($user->passwordResetToken->expires_at->isFuture());
     }
 
     #[Test]
-    public function it_validates_the_email(): void
+    public function it_validates_the_email()
     {
-        $user = factory()->user();
+        $user = User::factory()->create();
 
         $this->postRequestReset('wrong@example.com')
             ->assertSessionHasErrors('email')
             ->assertStatus(302);
     }
 
     #[Test]
-    public function it_can_render_the_password_reset_email(): void
+    public function it_can_render_the_password_reset_email()
     {
-        $user = factory()->user();
+        $user = User::factory()->create();
 
         $email = new PasswordResetMail($user, 'token');
 
@@ -126,34 +115,8 @@ public function it_can_render_the_password_reset_email(): void
         $email->render();
     }
 
-    /** @return array{string, string} */
-    private function createToken(string|User $email, string|CarbonInterface|null $createdAt = null): array
-    {
-        if ($email instanceof User) {
-            $email = $email->email;
-        }
-
-        DB::table('password_resets')->insert([
-            'email' => $email,
-            'token' => $token = sha1(Str::random()),
-            'created_at' => $createdAt ?? now(),
-        ]);
-
-        return [$email, $token];
-    }
-
-    private function showRequestPage(): TestResponse
-    {
-        return $this->get(route('login.requestPassword'));
-    }
-
     private function postRequestReset(string $email): TestResponse
     {
         return $this->post(route('login.requestPassword'), ['email' => $email]);
     }
-
-    private function showSuccessPage(): TestResponse
-    {
-        return $this->get(route('login.requestPassword.success'));
-    }
 }