Merge remote-tracking branch 'origin/main' into decorate-emails-in-ui

src/lib/db/user-store.ts

@@ -197,6 +197,8 @@ class UserStore implements IUserStore {
                 deleted_at: new Date(),
                 email: null,
                 username: null,
+                scim_id: null,
+                scim_external_id: null,
                 name: this.db.raw('name || ?', '(Deleted)'),
             });
     }

src/migrations/20250205072305-clean-scim-id-from-deleted-users.js

@@ -0,0 +1,14 @@
+exports.up = (db, cb) => {
+    db.runSql(`
+        UPDATE users
+        SET
+            scim_id = NULL,
+            scim_external_id = NULL
+        WHERE deleted_at IS NOT NULL AND scim_id IS NOT NULL;
+    `, cb);
+
+  };
+
+  exports.down = (db, cb) => {
+    cb();
+  };