fix(user): update hidden attributes and handle soft-deleted users in registration
This commit is contained in:
@@ -19,7 +19,7 @@ use Illuminate\Notifications\Notifiable;
|
|||||||
use Laravel\Sanctum\HasApiTokens;
|
use Laravel\Sanctum\HasApiTokens;
|
||||||
|
|
||||||
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
|
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
|
||||||
#[Hidden(['password', 'remember_token', 'active_email'])]
|
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
||||||
class User extends Authenticatable
|
class User extends Authenticatable
|
||||||
{
|
{
|
||||||
/** @use HasFactory<UserFactory> */
|
/** @use HasFactory<UserFactory> */
|
||||||
|
|||||||
@@ -104,7 +104,10 @@ class InvitationPurchaseProvisioner
|
|||||||
|
|
||||||
private function userId(DateTimeInterface $now): int
|
private function userId(DateTimeInterface $now): int
|
||||||
{
|
{
|
||||||
$user = DB::table('users')->where('email', self::USER_EMAIL)->first();
|
$user = DB::table('users')
|
||||||
|
->where('email', self::USER_EMAIL)
|
||||||
|
->whereNull('deleted_at')
|
||||||
|
->first();
|
||||||
|
|
||||||
if ($user !== null) {
|
if ($user !== null) {
|
||||||
if ($user->tenant_codigo !== self::TENANT_CODE) {
|
if ($user->tenant_codigo !== self::TENANT_CODE) {
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table): void {
|
||||||
|
$table->dropUnique(['google_id']);
|
||||||
|
$table->string('active_google_id')
|
||||||
|
->nullable()
|
||||||
|
->storedAs('CASE WHEN `deleted_at` IS NULL THEN `google_id` ELSE NULL END');
|
||||||
|
$table->unique('active_google_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table): void {
|
||||||
|
$table->dropUnique(['active_google_id']);
|
||||||
|
$table->dropColumn('active_google_id');
|
||||||
|
$table->unique('google_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -135,4 +135,36 @@ class RegisterControllerTest extends TestCase
|
|||||||
'password',
|
'password',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_it_can_reuse_the_email_of_a_soft_deleted_user(): void
|
||||||
|
{
|
||||||
|
$deletedUser = User::factory()->create([
|
||||||
|
'email' => 'reused@example.com',
|
||||||
|
]);
|
||||||
|
$deletedUser->delete();
|
||||||
|
|
||||||
|
$response = $this->postJson('/api/register', [
|
||||||
|
'nombre_apellido' => 'New Account',
|
||||||
|
'email' => 'reused@example.com',
|
||||||
|
'password' => 'Secret!123',
|
||||||
|
'password_confirmation' => 'Secret!123',
|
||||||
|
])->assertCreated();
|
||||||
|
|
||||||
|
$newUserId = $response->json('data.id');
|
||||||
|
|
||||||
|
$this->assertNotSame($deletedUser->id, $newUserId);
|
||||||
|
$this->assertSame(
|
||||||
|
2,
|
||||||
|
User::withTrashed()->where('email', 'reused@example.com')->count(),
|
||||||
|
);
|
||||||
|
$this->assertDatabaseHas('users', [
|
||||||
|
'id' => $deletedUser->id,
|
||||||
|
'active_email' => null,
|
||||||
|
]);
|
||||||
|
$this->assertDatabaseHas('users', [
|
||||||
|
'id' => $newUserId,
|
||||||
|
'active_email' => 'reused@example.com',
|
||||||
|
'deleted_at' => null,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user