From 502d8f30000d6cec7a431becb495c0fab451af0a Mon Sep 17 00:00:00 2001
From: Elorfin <penin.axel@gmail.com>
Date: Thu, 21 Jan 2021 08:59:53 +0100
Subject: [PATCH] [Workspace] only registers users at login if no ws role

---
 .../APINew/Workspace/RegistrationController.php        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/core/Controller/APINew/Workspace/RegistrationController.php b/src/main/core/Controller/APINew/Workspace/RegistrationController.php
index a65759b6cb7..ea128642079 100644
--- a/src/main/core/Controller/APINew/Workspace/RegistrationController.php
+++ b/src/main/core/Controller/APINew/Workspace/RegistrationController.php
@@ -394,10 +394,12 @@ public function selfRegisterAction(Workspace $workspace, User $currentUser): Jso
             throw new AccessDeniedException();
         }
 
-        if (!$workspace->getRegistrationValidation()) {
-            $this->workspaceManager->addUser($workspace, $currentUser);
-        } elseif (!$this->workspaceManager->isUserInValidationQueue($workspace, $currentUser)) {
-            $this->workspaceManager->addUserQueue($workspace, $currentUser);
+        if (!$this->workspaceManager->isRegistered($workspace, $currentUser)) {
+            if (!$workspace->getRegistrationValidation()) {
+                $this->workspaceManager->addUser($workspace, $currentUser);
+            } elseif (!$this->workspaceManager->isUserInValidationQueue($workspace, $currentUser)) {
+                $this->workspaceManager->addUserQueue($workspace, $currentUser);
+            }
         }
 
         return new JsonResponse(null, 204);