upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 58

feat(systemtag): Add $user context to create and update tag

Browse source 
Signed-off-by: Louis Chmn <louis@chmn.me>
This commit is contained in:
Louis Chmn 2026-03-26 10:54:08 +01:00 committed by Côme Chilliet
parent b71661a38b
commit 3aa2e130cd
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/private/SystemTag/SystemTagManager.php
View file

@ -159,8 +159,8 @@ class SystemTagManager implements ISystemTagManager {
}
}
public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
$user = $this->userSession->getUser();
public function createTag(string $tagName, bool $userVisible, bool $userAssignable, ?IUser $user = null): ISystemTag {
$user ??= $this->userSession->getUser();
if (!$this->canUserCreateTag($user)) {
throw new TagCreationForbiddenException();
}
@ -219,6 +219,7 @@ class SystemTagManager implements ISystemTagManager {
bool $userVisible,
bool $userAssignable,
?string $color,
?IUser $user = null,
): void {
try {
$tags = $this->getTagsByIds($tagId);
@ -228,7 +229,7 @@ class SystemTagManager implements ISystemTagManager {
);
}
$user = $this->userSession->getUser();
$user ??= $this->userSession->getUser();
if (!$this->canUserUpdateTag($user)) {
throw new TagUpdateForbiddenException();
}

8
lib/public/SystemTag/ISystemTagManager.php
View file

@ -61,6 +61,7 @@ interface ISystemTagManager {
* @param string $tagName tag name
* @param bool $userVisible whether the tag is visible by users
* @param bool $userAssignable whether the tag is assignable by users
* @param ?IUser $user the user that wants to create a tag. Null to use the one in session.
*
* @return ISystemTag system tag
*
@ -69,8 +70,9 @@ interface ISystemTagManager {
*
* @since 9.0.0
* @since 31.0.0 Can throw TagCreationForbiddenExceptionif user doesn't have the right to create a new tag
* @since 34.0.0 Added nullable $user parameter
*/
public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag;
public function createTag(string $tagName, bool $userVisible, bool $userAssignable, ?IUser $user = null): ISystemTag;
/**
* Returns all known tags, optionally filtered by visibility.
@ -92,6 +94,7 @@ interface ISystemTagManager {
* @param bool $userVisible whether the tag is visible by users
* @param bool $userAssignable whether the tag is assignable by users
* @param string $color color
* @param ?IUser $user the user that wants to update a tag. Null to use the one in session.
*
* @throws TagNotFoundException if tag with the given id does not exist
* @throws TagAlreadyExistsException if there is already another tag
@ -99,8 +102,9 @@ interface ISystemTagManager {
*
* @since 9.0.0
* @since 31.0.0 `$color` parameter added
* @since 34.0.0 Added nullable $user parameter
*/
public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable, ?string $color);
public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable, ?string $color, ?IUser $user = null): void;
/**
* Delete the given tags from the database and all their relationships.