fixup! feat: Allow user backends to manage property permissions

Signed-off-by: Côme Chilliet <[email protected]>

Author: come-nc

lib/private/User/User.php

@@ -414,30 +414,15 @@ public function getBackend(): ?UserInterface {
 		return $this->backend;
 	}
 
-	/**
-	 * Check if the backend allows the user to change their avatar on Personal page
-	 *
-	 * @return bool
-	 */
-	public function canChangeAvatar() {
+	public function canChangeAvatar(): bool {
 		return $this->canEditProperty(IAccountManager::PROPERTY_AVATAR);
 	}
 
-	/**
-	 * check if the backend supports changing passwords
-	 *
-	 * @return bool
-	 */
-	public function canChangePassword() {
+	public function canChangePassword(): bool {
 		return $this->backend->implementsActions(Backend::SET_PASSWORD);
 	}
 
-	/**
-	 * check if the backend supports changing display names
-	 *
-	 * @return bool
-	 */
-	public function canChangeDisplayName() {
+	public function canChangeDisplayName(): bool {
 		return $this->canEditProperty(IAccountManager::PROPERTY_DISPLAYNAME);
 	}
 

lib/public/IUser.php

@@ -8,6 +8,7 @@
 namespace OCP;
 
 use InvalidArgumentException;
+use OCP\Accounts\IAccountManager;
 use OCP\AppFramework\Attribute\Consumable;
 
 /**

lib/public/User/Backend/IPropertyPermissionBackend.php

@@ -9,7 +9,8 @@
 
 namespace OCP\User\Backend;
 
-use OCP\Account\IAccountManager;
+use OCP\Accounts\IAccountManager;
+use OCP\AppFramework\Attribute\Consumable;
 use OCP\AppFramework\Attribute\Implementable;
 
 /**
@@ -22,7 +23,7 @@ interface IPropertyPermissionBackend {
 	 * @since 34.0.0
 	 *
 	 * @param IAccountManager::PROPERTY_*|IAccountManager::COLLECTION_* $property
-	 * @return Whether the user is allowed to edit its own property
+	 * @return bool Whether the user is allowed to edit its own property
 	 */
 	public function canEditProperty(string $uid, string $property): bool;
 }