fixup! fix(env-mode): accept multiple comma-separated groups

Author: blizzz

lib/Controller/SAMLController.php

@@ -94,7 +94,7 @@ private function autoprovisionIfPossible(): void {
 		$autoProvisioningAllowed = $this->userBackend->autoprovisionAllowed();
 		if ($userExists) {
 			if ($autoProvisioningAllowed) {
-				$this->userBackend->updateAttributes($uid, $auth);
+				$this->userBackend->updateAttributes($uid);
 			}
 			return;
 		}
@@ -104,7 +104,7 @@ private function autoprovisionIfPossible(): void {
 			throw new NoUserFoundException('Auto provisioning not allowed and user ' . $uid . ' does not exist');
 		} elseif (!$userExists && $autoProvisioningAllowed) {
 			$this->userBackend->createUserIfNotExists($uid, $auth);
-			$this->userBackend->updateAttributes($uid, $auth);
+			$this->userBackend->updateAttributes($uid);
 			return;
 		}
 	}

lib/UserBackend.php

@@ -474,7 +474,8 @@ private function getAttributeValue($name, array $attributes) {
 		return $value;
 	}
 
-	public function updateAttributes(string $uid, array $attributes): void {
+	public function updateAttributes(string $uid): void {
+		$attributes = $this->userData->getAttributes();
 		$user = $this->userManager->get($uid);
 		try {
 			$newEmail = $this->getAttributeValue('saml-attribute-mapping-email_mapping', $attributes);

tests/unit/UserBackendTest.php

@@ -155,6 +155,13 @@ public function testUpdateAttributes() {
 		/** @var IUser|MockObject $user */
 		$user = $this->createMock(IUser::class);
 
+		$attributes = [
+			'email' => '[email protected]',
+			'displayname' => 'New Displayname',
+			'quota' => '50MB',
+			'groups' => ['groupB', 'groupC'],
+		];
+
 		// Replace at() matcher with willReturnCallback to avoid deprecation warning
 		$this->config
 			->method('getAppValue')
@@ -204,19 +211,20 @@ public function testUpdateAttributes() {
 			->expects($this->once())
 			->method('handleIncomingGroups')
 			->with($user, ['groupB', 'groupC']);
-		$this->userBackend->updateAttributes('ExistingUser', [
-			'email' => '[email protected]',
-			'displayname' => 'New Displayname',
-			'quota' => '50MB',
-			'groups' => ['groupB', 'groupC'],
-		]);
+		$this->userData->expects($this->any())
+			->method('getAttributes')
+			->willReturn($attributes);
+		$this->userData->expects($this->any())
+			->method('getGroups')
+			->willReturn($attributes['groups']);
+		$this->userBackend->updateAttributes('ExistingUser');
 	}
 
 	public function testUpdateAttributesQuotaDefaultFallback() {
 		$this->getMockedBuilder(['getDisplayName', 'setDisplayName']);
 		/** @var IUser|MockObject $user */
 		$user = $this->createMock(IUser::class);
-
+		$attributes = ['email' => '[email protected]', 'displayname' => 'New Displayname', 'quota' => ''];
 
 		$this->config->method('getAppValue')
 			->willReturnCallback(fn (string $appId, string $key, string $default) =>
@@ -261,6 +269,12 @@ public function testUpdateAttributesQuotaDefaultFallback() {
 			->expects($this->once())
 			->method('handleIncomingGroups')
 			->with($user, []);
-		$this->userBackend->updateAttributes('ExistingUser', ['email' => '[email protected]', 'displayname' => 'New Displayname', 'quota' => '']);
+		$this->userData->expects($this->any())
+			->method('getAttributes')
+			->willReturn($attributes);
+		$this->userData->expects($this->any())
+			->method('getGroups')
+			->willReturn([]);
+		$this->userBackend->updateAttributes('ExistingUser');
 	}
 }