From 6ee6c011e3cb5e598ab4b0011aa20bb476c634c1 Mon Sep 17 00:00:00 2001
From: Thomasr <techninjas514@thecoderagency.com>
Date: Mon, 26 May 2025 12:56:54 -0400
Subject: [PATCH 1/2] Only one super admin should exists

---
 .../domain/user/service/UserServiceImpl.java   |  5 +++++
 .../runner/migrations/DatabaseChangelog.java   | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
index 8da89a8476..1a8dcf566e 100644
--- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
+++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -183,6 +183,11 @@ public Mono<User> createNewUserByAuthUser(AuthUser authUser, boolean isSuperAdmi
         newUser.setConnections(connections);
         newUser.setActiveAuthId(connection.getAuthId());
         newUser.setIsNewUser(true);
+        if(isSuperAdmin) {
+            return repository.findBySuperAdminIsTrue()
+                    .flatMap(user -> update(user.getId(), newUser))
+                    .switchIfEmpty(create(newUser));
+        }
         return create(newUser);
     }
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
index 20611b8d8a..e94be15664 100644
--- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
+++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
@@ -479,6 +479,24 @@ public void renameApplicationRecordCollection(MongockTemplate mongoTemplate, Mon
 
     }
 
+    @ChangeSet(order = "031", id = "delete-old-super-admin", author = "Thomas")
+    public void deleteOldSuperAdmin(MongockTemplate mongoTemplate, MongoDatabase mongoDatabase) {
+        List<User> users = mongoTemplate.find(
+                Query.query(Criteria.where("superAdmin").is(true))
+                        .with(Sort.by(Sort.Direction.DESC, "createdAt")),
+                User.class
+        );
+
+        // Ensure there's more than one superAdmin user
+        if (users.size() > 1) {
+            // Keep the most recent one (first in the sorted list), delete the rest
+            List<User> usersToDelete = users.subList(1, users.size());
+            for (User user : usersToDelete) {
+                mongoTemplate.remove(user);
+            }
+        }
+    }
+
     private void addGidField(MongockTemplate mongoTemplate, String collectionName) {
         // Create a query to match all documents
         Query query = new Query();

From 5b881e68ebe7de1034ea3c331d85e9b487ebd951 Mon Sep 17 00:00:00 2001
From: dragonpoo <72492398+dragonpoo@users.noreply.github.com>
Date: Mon, 26 May 2025 13:18:26 -0400
Subject: [PATCH 2/2] Update
 server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../lowcoder/runner/migrations/DatabaseChangelog.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
index e94be15664..d19cb0b3e4 100644
--- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
+++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
@@ -490,10 +490,13 @@ public void deleteOldSuperAdmin(MongockTemplate mongoTemplate, MongoDatabase mon
         // Ensure there's more than one superAdmin user
         if (users.size() > 1) {
             // Keep the most recent one (first in the sorted list), delete the rest
-            List<User> usersToDelete = users.subList(1, users.size());
-            for (User user : usersToDelete) {
-                mongoTemplate.remove(user);
-            }
+            List<ObjectId> userIdsToDelete = users.subList(1, users.size())
+                    .stream()
+                    .map(User::getId)
+                    .collect(Collectors.toList());
+
+            Query deleteQuery = Query.query(Criteria.where("_id").in(userIdsToDelete));
+            mongoTemplate.remove(deleteQuery, User.class);
         }
     }
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1710.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1710.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1710.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1710.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>