saml: allow to keep existing roles on login (#3440)

2022-07-26 23:18:04 +02:00
parent ed7f89cfe1
commit 95ab9bda2d
6 changed files with 23 additions and 1 deletions
--- a/src/Saml/User/SamlUserFactory.php
+++ b/src/Saml/User/SamlUserFactory.php
@@ -56,7 +56,13 @@ final class SamlUserFactory
                    $roles[] = $groupMap[$groupName];
                }
            }
-            $user->setRoles($roles);
+            if ($this->configuration->isRolesResetOnLogin()) {
+                $user->setRoles($roles);
+            } else {
+                foreach ($roles as $role) {
+                    $user->addRole($role);
+                }
+            }
        }

        $mappingConfig = $this->configuration->getAttributeMapping();