feat: make systemtags public visible

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>

apps/dav/appinfo/v2/publicremote.php

@@ -12,6 +12,7 @@
 use OCA\DAV\Storage\PublicOwnerWrapper;
 use OCA\DAV\Storage\PublicShareWrapper;
 use OCA\FederatedFileSharing\FederatedShareProvider;
+use OCP\BeforeSabrePubliclyLoadedEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Mount\IMountManager;
 use OCP\IConfig;
@@ -35,6 +36,7 @@
 
 $session = \OCP\Server::get(ISession::class);
 $request = \OCP\Server::get(IRequest::class);
+$eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
 
 $session->close();
 $requestUri = $request->getRequestUri();
@@ -59,7 +61,7 @@
  \OCP\Server::get(ITagManager::class),
  $request,
  \OCP\Server::get(IPreview::class),
- \OCP\Server::get(IEventDispatcher::class),
+ $eventDispatcher,
  $l10nFactory->get('dav'),
 );
 
@@ -131,5 +133,9 @@
 $server->addPlugin($linkCheckPlugin);
 $server->addPlugin($filesDropPlugin);
 
+// allow setup of additional plugins
+$event = new BeforeSabrePubliclyLoadedEvent($server);
+$eventDispatcher->dispatchTyped($event);
+
 // And off we go!
 $server->exec();

apps/dav/lib/Connector/Sabre/ServerFactory.php

@@ -11,56 +11,40 @@
 use OCA\DAV\CalDAV\DefaultCalendarValidator;
 use OCA\DAV\DAV\ViewOnlyPlugin;
 use OCA\DAV\Files\ErrorPagePlugin;
+use OCA\DAV\SystemTag\SystemTagPlugin;
 use OCA\Theming\ThemingDefaults;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Folder;
 use OCP\Files\IFilenameValidator;
 use OCP\Files\Mount\IMountManager;
 use OCP\IConfig;
 use OCP\IDBConnection;
+use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IPreview;
 use OCP\IRequest;
 use OCP\ITagManager;
 use OCP\IUserSession;
 use OCP\SabrePluginEvent;
+use OCP\SystemTag\ISystemTagManager;
+use OCP\SystemTag\ISystemTagObjectMapper;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Auth\Plugin;
 
 class ServerFactory {
- private IConfig $config;
- private LoggerInterface $logger;
- private IDBConnection $databaseConnection;
- private IUserSession $userSession;
- private IMountManager $mountManager;
- private ITagManager $tagManager;
- private IRequest $request;
- private IPreview $previewManager;
- private IEventDispatcher $eventDispatcher;
- private IL10N $l10n;
 
  public function __construct(
- IConfig $config,
- LoggerInterface $logger,
- IDBConnection $databaseConnection,
- IUserSession $userSession,
- IMountManager $mountManager,
- ITagManager $tagManager,
- IRequest $request,
- IPreview $previewManager,
- IEventDispatcher $eventDispatcher,
- IL10N $l10n
+ private IConfig $config,
+ private LoggerInterface $logger,
+ private IDBConnection $databaseConnection,
+ private IUserSession $userSession,
+ private IMountManager $mountManager,
+ private ITagManager $tagManager,
+ private IRequest $request,
+ private IPreview $previewManager,
+ private IEventDispatcher $eventDispatcher,
+ private IL10N $l10n
  ) {
- $this->config = $config;
- $this->logger = $logger;
- $this->databaseConnection = $databaseConnection;
- $this->userSession = $userSession;
- $this->mountManager = $mountManager;
- $this->tagManager = $tagManager;
- $this->request = $request;
- $this->previewManager = $previewManager;
- $this->eventDispatcher = $eventDispatcher;
- $this->l10n = $l10n;
  }
 
  /**

apps/dav/lib/Server.php

@@ -197,7 +197,7 @@ public function __construct(IRequest $request, string $baseUri) {
  }
 
  // system tags plugins
- $this->server->addPlugin(\OC::$server->get(SystemTagPlugin::class));
+ // $this->server->addPlugin(\OCP\Server::get(SystemTagPlugin::class));
 
  // comments plugin
  $this->server->addPlugin(new CommentsPlugin(

apps/dav/lib/SystemTag/SystemTagList.php

@@ -20,12 +20,13 @@
 class SystemTagList implements Element {
  public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
 
- /** @var ISystemTag[] */
- private array $tags;
- private ISystemTagManager $tagManager;
- private IUser $user;
-
- public function __construct(array $tags, ISystemTagManager $tagManager, IUser $user) {
+ /**
+ * @param ISystemTag[] $tags
+ */
+ public function __construct(
+ private array $tags,
+ private ISystemTagManager $tagManager,
+ private ?IUser $user) {
  $this->tags = $tags;
  $this->tagManager = $tagManager;
  $this->user = $user;

apps/dav/lib/SystemTag/SystemTagPlugin.php

@@ -305,9 +305,6 @@ private function propfindForFile(PropFind $propFind, Node $node): void {
 
  $propFind->handle(self::SYSTEM_TAGS_PROPERTYNAME, function () use ($node) {
  $user = $this->userSession->getUser();
- if ($user === null) {
- return;
- }
 
  $tags = $this->getTagsForFile($node->getId(), $user);
  usort($tags, function (ISystemTag $tagA, ISystemTag $tagB): int {
@@ -321,8 +318,7 @@ private function propfindForFile(PropFind $propFind, Node $node): void {
  * @param int $fileId
  * @return ISystemTag[]
  */
- private function getTagsForFile(int $fileId, IUser $user): array {
-
+ private function getTagsForFile(int $fileId, ?IUser $user): array {
  if (isset($this->cachedTagMappings[$fileId])) {
  $tagIds = $this->cachedTagMappings[$fileId];
  } else {

apps/systemtags/composer/composer/autoload_classmap.php

@@ -13,6 +13,9 @@
  'OCA\\SystemTags\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
  'OCA\\SystemTags\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
  'OCA\\SystemTags\\Controller\\LastUsedController' => $baseDir . '/../lib/Controller/LastUsedController.php',
+ 'OCA\\SystemTags\\Listeners\\BeforeSabrePubliclyLoadedListener' => $baseDir . '/../lib/Listeners/BeforeSabrePubliclyLoadedListener.php',
+ 'OCA\\SystemTags\\Listeners\\BeforeTemplateRenderedListener' => $baseDir . '/../lib/Listeners/BeforeTemplateRenderedListener.php',
+ 'OCA\\SystemTags\\Listeners\\LoadAdditionalScriptsListener' => $baseDir . '/../lib/Listeners/LoadAdditionalScriptsListener.php',
  'OCA\\SystemTags\\Search\\TagSearchProvider' => $baseDir . '/../lib/Search/TagSearchProvider.php',
  'OCA\\SystemTags\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
 );

apps/systemtags/composer/composer/autoload_static.php

@@ -28,6 +28,9 @@ class ComposerStaticInitSystemTags
  'OCA\\SystemTags\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
  'OCA\\SystemTags\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
  'OCA\\SystemTags\\Controller\\LastUsedController' => __DIR__ . '/..' . '/../lib/Controller/LastUsedController.php',
+ 'OCA\\SystemTags\\Listeners\\BeforeSabrePubliclyLoadedListener' => __DIR__ . '/..' . '/../lib/Listeners/BeforeSabrePubliclyLoadedListener.php',
+ 'OCA\\SystemTags\\Listeners\\BeforeTemplateRenderedListener' => __DIR__ . '/..' . '/../lib/Listeners/BeforeTemplateRenderedListener.php',
+ 'OCA\\SystemTags\\Listeners\\LoadAdditionalScriptsListener' => __DIR__ . '/..' . '/../lib/Listeners/LoadAdditionalScriptsListener.php',
  'OCA\\SystemTags\\Search\\TagSearchProvider' => __DIR__ . '/..' . '/../lib/Search/TagSearchProvider.php',
  'OCA\\SystemTags\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
  );

apps/systemtags/lib/AppInfo/Application.php

@@ -9,13 +9,18 @@
 namespace OCA\SystemTags\AppInfo;
 
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
+use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
 use OCA\SystemTags\Activity\Listener;
 use OCA\SystemTags\Capabilities;
+use OCA\SystemTags\Listeners\BeforeSabrePubliclyLoadedListener;
+use OCA\SystemTags\Listeners\BeforeTemplateRenderedListener;
+use OCA\SystemTags\Listeners\LoadAdditionalScriptsListener;
 use OCA\SystemTags\Search\TagSearchProvider;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\BeforeSabrePubliclyLoadedEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\SystemTag\ManagerEvent;
 use OCP\SystemTag\MapperEvent;
@@ -30,6 +35,9 @@ public function __construct() {
  public function register(IRegistrationContext $context): void {
  $context->registerSearchProvider(TagSearchProvider::class);
  $context->registerCapability(Capabilities::class);
+ $context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalScriptsListener::class);
+ $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
+ $context->registerEventListener(BeforeSabrePubliclyLoadedEvent::class, BeforeSabrePubliclyLoadedListener::class);
  }
 
  public function boot(IBootContext $context): void {

apps/systemtags/lib/Listeners/BeforeSabrePubliclyLoadedListener.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\SystemTags\Listeners;
+
+use OCA\DAV\SystemTag\SystemTagPlugin;
+use OCP\BeforeSabrePubliclyLoadedEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Server;
+
+/**
+ * @template-implements IEventListener<BeforeSabrePubliclyLoadedEvent>
+ */
+class BeforeSabrePubliclyLoadedListener implements IEventListener {
+ public function handle(Event $event): void {
+ if (!$event instanceof BeforeSabrePubliclyLoadedEvent) {
+ return;
+ }
+ $event->getServer()->addPlugin(Server::get(SystemTagPlugin::class));
+ }
+}

apps/systemtags/lib/Listeners/BeforeTemplateRenderedListener.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\SystemTags\Listeners;
+
+use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
+use OCA\SystemTags\AppInfo\Application;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Util;
+
+/**
+ * @template-implements IEventListener<BeforeTemplateRenderedEvent>
+ */
+class BeforeTemplateRenderedListener implements IEventListener {
+ public function handle(Event $event): void {
+ if (!$event instanceof BeforeTemplateRenderedEvent) {
+ return;
+ }
+ Util::addInitScript(Application::APP_ID, 'init');
+ }
+}

apps/systemtags/lib/Listeners/LoadAdditionalScriptsListener.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\SystemTags\Listeners;
+
+use OCA\Files\Event\LoadAdditionalScriptsEvent;
+use OCA\Systemtags\AppInfo\Application;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Util;
+
+/**
+ * @template-implements IEventListener<LoadAdditionalScriptsEvent>
+ */
+class LoadAdditionalScriptsListener implements IEventListener {
+ public function handle(Event $event): void {
+ if (!$event instanceof LoadAdditionalScriptsEvent) {
+ return;
+ }
+ Util::addInitScript(Application::APP_ID, 'init');
+ }
+}

lib/private/SystemTag/SystemTagManager.php

@@ -305,7 +305,11 @@ public function deleteTags($tagIds): void {
  /**
  * {@inheritdoc}
  */
- public function canUserAssignTag(ISystemTag $tag, IUser $user): bool {
+ public function canUserAssignTag(ISystemTag $tag, ?IUser $user): bool {
+ if ($user === null) {
+ return false;
+ }
+
  // early check to avoid unneeded group lookups
  if ($tag->isUserAssignable() && $tag->isUserVisible()) {
  return true;
@@ -333,11 +337,16 @@ public function canUserAssignTag(ISystemTag $tag, IUser $user): bool {
  /**
  * {@inheritdoc}
  */
- public function canUserSeeTag(ISystemTag $tag, IUser $user): bool {
+ public function canUserSeeTag(ISystemTag $tag, ?IUser $user): bool {
  if ($tag->isUserVisible()) {
  return true;
  }
 
+ // If no user and not user visible, then it's invisible
+ if ($user === null) {
+ return false;
+ }
+
  if ($this->groupManager->isAdmin($user->getUID())) {
  return true;
  }

lib/public/SystemTag/ISystemTagManager.php

@@ -112,7 +112,7 @@ public function deleteTags($tagIds);
  *
  * @since 9.1.0
  */
- public function canUserAssignTag(ISystemTag $tag, IUser $user): bool;
+ public function canUserAssignTag(ISystemTag $tag, ?IUser $user): bool;
 
  /**
  * Checks whether the given user is allowed to see the tag with the given id.
@@ -124,7 +124,7 @@ public function canUserAssignTag(ISystemTag $tag, IUser $user): bool;
  *
  * @since 9.1.0
  */
- public function canUserSeeTag(ISystemTag $tag, IUser $user): bool;
+ public function canUserSeeTag(ISystemTag $tag, ?IUser $user): bool;
 
  /**
  * Set groups that can assign a given tag.