Skip to content

[stable26] fix(files): Don't throw an error when guests access the controller #37836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Apr 24, 2023
Merged

[stable26] fix(files): Don't throw an error when guests access the controller #37836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions apps/files/lib/Controller/ApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,17 @@ class ApiController extends Controller {
private IPreview $previewManager;
private IUserSession $userSession;
private IConfig $config;
private Folder $userFolder;
private ?Folder $userFolder;
private UserConfig $userConfig;

/**
* @param string $appName
* @param IRequest $request
* @param IUserSession $userSession
* @param TagService $tagService
* @param IPreview $previewManager
* @param IManager $shareManager
* @param IConfig $config
* @param Folder $userFolder
*/
public function __construct($appName,
public function __construct(string $appName,
IRequest $request,
IUserSession $userSession,
TagService $tagService,
IPreview $previewManager,
IManager $shareManager,
IConfig $config,
Folder $userFolder,
?Folder $userFolder,
UserConfig $userConfig) {
parent::__construct($appName, $request);
$this->userSession = $userSession;
Expand Down
7 changes: 5 additions & 2 deletions apps/files/lib/Service/TagService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TagService {
private $activityManager;
/** @var ITags|null */
private $tagger;
/** @var Folder */
/** @var Folder|null */
private $homeFolder;
/** @var EventDispatcherInterface */
private $dispatcher;
Expand All @@ -53,7 +53,7 @@ public function __construct(
IUserSession $userSession,
IManager $activityManager,
?ITags $tagger,
Folder $homeFolder,
?Folder $homeFolder,
EventDispatcherInterface $dispatcher
) {
$this->userSession = $userSession;
Expand All @@ -77,6 +77,9 @@ public function updateFileTags($path, $tags) {
if ($this->tagger === null) {
throw new \RuntimeException('No tagger set');
}
if ($this->homeFolder === null) {
throw new \RuntimeException('No homeFolder set');
}

$fileId = $this->homeFolder->get($path)->getId();

Expand Down