Merge pull request #1038 from amvanbaren/bugfix/unique-system-users

Add system provider for users
eclipse · Nov 14, 2024 · 03d2710 · 03d2710
2 parents c123517 + 1a0609f
commit 03d2710
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/server/src/main/java/org/eclipse/openvsx/extension_control/ExtensionControlService.java b/server/src/main/java/org/eclipse/openvsx/extension_control/ExtensionControlService.java
@@ -88,9 +88,10 @@ public void applicationStarted(ApplicationStartedEvent event) {
     @Transactional
     public UserData createExtensionControlUser() {
         var userName = "ExtensionControlUser";
-        var user = repositories.findUserByLoginName(null, userName);
+        var user = repositories.findUserByLoginName("system", userName);
         if(user == null) {
             user = new UserData();
+            user.setProvider("system");
             user.setLoginName(userName);
             entityManager.persist(user);
         }

diff --git a/server/src/main/java/org/eclipse/openvsx/migration/FixTargetPlatformsService.java b/server/src/main/java/org/eclipse/openvsx/migration/FixTargetPlatformsService.java
@@ -29,9 +29,10 @@ public FixTargetPlatformsService(RepositoryService repositories, EntityManager e
     @Transactional
     public UserData getUser() {
         var userName = "FixTargetPlatformMigration";
-        var user = repositories.findUserByLoginName(null, userName);
+        var user = repositories.findUserByLoginName("system", userName);
         if(user == null) {
             user = new UserData();
+            user.setProvider("system");
             user.setLoginName(userName);
             entityManager.persist(user);
         }

diff --git a/server/src/main/java/org/eclipse/openvsx/mirror/DataMirrorService.java b/server/src/main/java/org/eclipse/openvsx/mirror/DataMirrorService.java
@@ -131,12 +131,21 @@ public List<ExtensionVersion> getExtensionTargetVersions(String namespaceName, S
 
     @Transactional
     public UserData createMirrorUser() {
-        var user = repositories.findUserByLoginName(null, userName);
-        if(user == null) {
-            user = new UserData();
-            user.setLoginName(userName);
-            entityManager.persist(user);
+        var user = repositories.findUserByLoginName("system", userName);
+        if(user != null) {
+            return user;
         }
+
+        user = repositories.findUserByLoginName(null, userName);
+        if(user != null) {
+            user.setProvider("system");
+            return user;
+        }
+
+        user = new UserData();
+        user.setProvider("system");
+        user.setLoginName(userName);
+        entityManager.persist(user);
         return user;
     }
 

diff --git a/server/src/main/resources/db/migration/V1_49__System_User.sql b/server/src/main/resources/db/migration/V1_49__System_User.sql
@@ -0,0 +1 @@
+UPDATE user_data SET provider = 'system' WHERE login_name IN ('ExtensionControlUser', 'FixTargetPlatformMigration');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		UPDATE user_data SET provider = 'system' WHERE login_name IN ('ExtensionControlUser', 'FixTargetPlatformMigration');