do not append »(SAML)« suffix to display names

- change compared to before that may confuse end users - technical term unnecessary to display to non-technical users - would only suit LTR languages Signed-off-by: Arthur Schiwon <[email protected]>
nextcloud · Nov 7, 2022 · 1055402 · 1055402
1 parent 608ad31
commit 1055402
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/GroupBackend.php b/lib/GroupBackend.php
@@ -197,11 +197,10 @@ public function createGroup(string $gid, string $samlGid = null): bool {
 		try {
 			// Add group
 			$builder = $this->dbc->getQueryBuilder();
-			$displayName = $samlGid ? $gid . ' (SAML)' : $gid;
 			$samlGid = $samlGid ?? $gid;
 			$result = $builder->insert(self::TABLE_GROUPS)
 				->setValue('gid', $builder->createNamedParameter($gid))
-				->setValue('displayname', $builder->createNamedParameter($displayName))
+				->setValue('displayname', $builder->createNamedParameter($samlGid))
 				->setValue('saml_gid', $builder->createNamedParameter($samlGid))
 				->executeStatement();
 		} catch (UniqueConstraintViolationException $e) {

diff --git a/lib/GroupManager.php b/lib/GroupManager.php
@@ -159,10 +159,9 @@ public function addGroups(IUser $user, $groupIds): void {
 	public function addGroup(IUser $user, string $gid): void {
 		try {
 			$group = $this->findGroup($gid);
-		} catch(GroupNotFoundException $e) {
+		} catch (GroupNotFoundException $e) {
 			$group = $this->createGroupInBackend($gid);
 		} catch (NonMigratableGroupException $e) {
-			//FIXME: probably need config flag. Previous to 17, gid was used as displayname
 			$providerId = $this->settings->getProviderId();
 			$settings = $this->settings->get($providerId);
 			$groupPrefix = $settings['saml-attribute-mapping-group_mapping_prefix'] ?? SAMLSettings::DEFAULT_GROUP_PREFIX;