Skip to content

Beautiful Open-Source Form Builder

Enhance user identities migration logic and testing (#1137)

Chirag Chhatralaca4140a3120a
diff --git a/api/database/migrations/2025_11_17_105205_create_user_identities_table.php b/api/database/migrations/2025_11_17_105205_create_user_identities_table.php
index 1fd4b0e83..abd55ea66 100644
--- a/api/database/migrations/2025_11_17_105205_create_user_identities_table.php
+++ b/api/database/migrations/2025_11_17_105205_create_user_identities_table.php
@@ -10,8 +10,9 @@ return new class () extends Migration {
*/
public function up(): void
{
- // Drop table if it exists (from failed migration) to ensure clean state
- Schema::dropIfExists('user_identities');
+ if (Schema::hasTable('user_identities')) {
+ return;
+ }
Schema::create('user_identities', function (Blueprint $table) {
$table->id();
diff --git a/api/tests/Feature/Enterprise/Oidc/UserIdentitiesMigrationTest.php b/api/tests/Feature/Enterprise/Oidc/UserIdentitiesMigrationTest.php
new file mode 100644
index 000000000..9b0323d2a
--- /dev/null
+++ b/api/tests/Feature/Enterprise/Oidc/UserIdentitiesMigrationTest.php
@@ -0,0 +1,44 @@
+<?php
+
+use App\Enterprise\Oidc\Models\IdentityConnection;
+use App\Enterprise\Oidc\Models\UserIdentity;
+use App\Models\User;
+use Illuminate\Support\Facades\Schema;
+
+function userIdentitiesMigration()
+{
+ return include database_path('migrations/2025_11_17_105205_create_user_identities_table.php');
+}
+
+it('does not drop existing user identities when migration up runs again', function () {
+ expect(Schema::hasTable('user_identities'))->toBeTrue();
+
+ $connection = IdentityConnection::factory()->create();
+ $user = User::factory()->create();
+
+ $identity = UserIdentity::factory()->create([
+ 'user_id' => $user->id,
+ 'connection_id' => $connection->id,
+ 'subject' => 'oidc-subject-keep-me',
+ 'email' => '[email protected]',
+ ]);
+
+ userIdentitiesMigration()->up();
+
+ expect(Schema::hasTable('user_identities'))->toBeTrue();
+ $this->assertDatabaseHas('user_identities', [
+ 'id' => $identity->id,
+ 'subject' => 'oidc-subject-keep-me',
+ 'email' => '[email protected]',
+ ]);
+});
+
+it('creates user identities table when missing', function () {
+ Schema::dropIfExists('user_identities');
+
+ userIdentitiesMigration()->up();
+
+ expect(Schema::hasTable('user_identities'))->toBeTrue();
+ expect(Schema::hasColumn('user_identities', 'connection_id'))->toBeTrue();
+ expect(Schema::hasColumn('user_identities', 'subject'))->toBeTrue();
+});