Rename storage to rootFolder

Signed-off-by: GitHub <[email protected]>

lib/BackgroundJob/CleanupUploadedFilesJob.php

@@ -36,7 +36,7 @@ class CleanupUploadedFilesJob extends TimedJob {
  private const FILE_LIFETIME = '-1 hour';
 
  public function __construct(
- private IRootFolder $storage,
+ private IRootFolder $rootFolder,
  private FormMapper $formMapper,
  private UploadedFileMapper $uploadedFileMapper,
  private LoggerInterface $logger,
@@ -69,7 +69,7 @@ public function run($argument): void {
 
  $form = $this->formMapper->findById($uploadedFile->getFormId());
  $usersToCleanup[$form->getOwnerId()] = true;
- $userFolder = $this->storage->getUserFolder($form->getOwnerId());
+ $userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
 
  $nodes = $userFolder->getById($uploadedFile->getFileId());
 
@@ -93,7 +93,7 @@ public function run($argument): void {
  $deleted = 0;
  foreach (array_keys($usersToCleanup) as $userId) {
  $this->logger->info('Cleaning up empty folders for user {userId}.', ['userId' => $userId]);
- $userFolder = $this->storage->getUserFolder($userId);
+ $userFolder = $this->rootFolder->getUserFolder($userId);
 
  $unsubmittedFilesFolder = $userFolder->get(Constants::UNSUBMITTED_FILES_FOLDER);
  if (!$unsubmittedFilesFolder instanceof Folder) {

lib/Controller/ApiController.php

@@ -87,7 +87,7 @@ public function __construct(
  private IL10N $l10n,
  private LoggerInterface $logger,
  private IUserManager $userManager,
- private IRootFolder $storage,
+ private IRootFolder $rootFolder,
  private UploadedFileMapper $uploadedFileMapper,
  private IMimeTypeDetector $mimeTypeDetector,
  ) {
@@ -1253,7 +1253,7 @@ public function uploadFiles(int $formId, int $questionId, string $shareHash = ''
  throw new OCSBadRequestException('Invalid file provided');
  }
 
- $userFolder = $this->storage->getUserFolder($form->getOwnerId());
+ $userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
  $userFolder->getStorage()->verifyPath($path, $uploadedFile['name']);
 
  $extraSettings = $question->getExtraSettings();
@@ -2217,7 +2217,7 @@ public function uploadFilesLegacy(int $formId, int $questionId, string $shareHas
  throw new OCSBadRequestException('Invalid file provided');
  }
 
- $userFolder = $this->storage->getUserFolder($form->getOwnerId());
+ $userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
  $userFolder->getStorage()->verifyPath($path, $uploadedFile['name']);
 
  $extraSettings = $question->getExtraSettings();
@@ -2634,7 +2634,7 @@ private function storeAnswersForQuestion(Form $form, $submissionId, array $quest
  $uploadedFile = $this->uploadedFileMapper->getByUploadedFileId($answer['uploadedFileId']);
  $answerEntity->setFileId($uploadedFile->getFileId());
 
- $userFolder = $this->storage->getUserFolder($form->getOwnerId());
+ $userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
  $path = $this->formsService->getUploadedFilePath($form, $submissionId, $question['id'], $question['name'], $question['text']);
 
  if ($userFolder->nodeExists($path)) {

lib/Controller/ShareApiController.php

@@ -69,7 +69,7 @@ public function __construct(
  private IUserManager $userManager,
  private ISecureRandom $secureRandom,
  private CirclesService $circlesService,
- private IRootFolder $storage,
+ private IRootFolder $rootFolder,
  private IManager $shareManager,
  ) {
  parent::__construct($appName, $request);
@@ -261,7 +261,7 @@ public function updateShare(int $formId, int $shareId, array $keyValuePairs): Da
  $formShare = $this->shareMapper->update($formShare);
 
  if (in_array($formShare->getShareType(), [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP, IShare::TYPE_CIRCLE], true)) {
- $userFolder = $this->storage->getUserFolder($form->getOwnerId());
+ $userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
  $uploadedFilesFolderPath = $this->formsService->getFormUploadedFilesFolderPath($form);
  if ($userFolder->nodeExists($uploadedFilesFolderPath)) {
  $folder = $userFolder->get($uploadedFilesFolderPath);
@@ -558,7 +558,7 @@ public function updateShareLegacy(int $id, array $keyValuePairs): DataResponse {
  $formShare = $this->shareMapper->update($formShare);
 
  if (in_array($formShare->getShareType(), [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP, IShare::TYPE_CIRCLE], true)) {
- $userFolder = $this->storage->getUserFolder($form->getOwnerId());
+ $userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
  $uploadedFilesFolderPath = $this->formsService->getFormUploadedFilesFolderPath($form);
  if ($userFolder->nodeExists($uploadedFilesFolderPath)) {
  $folder = $userFolder->get($uploadedFilesFolderPath);

lib/Service/FormsService.php

@@ -70,7 +70,7 @@ public function __construct(
  private IUserManager $userManager,
  private ISecureRandom $secureRandom,
  private CirclesService $circlesService,
- private IRootFolder $storage,
+ private IRootFolder $rootFolder,
  private IL10N $l10n,
  private IMimeTypeDetector $mimeTypeDetector,
  private IEventDispatcher $eventDispatcher,
@@ -742,7 +742,7 @@ public function getFilePath(Form $form): ?string {
  return null;
  }
 
- $folder = $this->storage->getUserFolder($form->getOwnerId());
+ $folder = $this->rootFolder->getUserFolder($form->getOwnerId());
  $nodes = $folder->getById($fileId);
 
  if (empty($nodes)) {

lib/Service/SubmissionService.php

@@ -65,7 +65,7 @@ public function __construct(
  private SubmissionMapper $submissionMapper,
  private AnswerMapper $answerMapper,
  private UploadedFileMapper $uploadedFileMapper,
- private IRootFolder $storage,
+ private IRootFolder $rootFolder,
  private IConfig $config,
  private IL10N $l10n,
  private LoggerInterface $logger,
@@ -146,9 +146,9 @@ public function writeFileToCloud(Form $form, string $path, string $fileFormat, ?
 
  /** @var \OCP\Files\Folder|File $node */
  if ($ownerId) {
- $node = $this->storage->getUserFolder($ownerId)->get($path);
+ $node = $this->rootFolder->getUserFolder($ownerId)->get($path);
  } else {
- $node = $this->storage->getUserFolder($this->currentUser->getUID())->get($path);
+ $node = $this->rootFolder->getUserFolder($this->currentUser->getUID())->get($path);
  }
 
  // If chosen path is a file with expected extension - overwrite it and use parent folder otherwise.
@@ -417,7 +417,7 @@ public function validateSubmission(array $questions, array $answers, string $for
  return sprintf('File "%s" for question "%s" not exists anymore. Please delete and re-upload the file.', $answer['fileName'] ?? $answer['uploadedFileId'], $question['text']);
  }
 
- $nodes = $this->storage->getUserFolder($formOwnerId)->getById($uploadedFile->getFileId());
+ $nodes = $this->rootFolder->getUserFolder($formOwnerId)->getById($uploadedFile->getFileId());
  if (empty($nodes)) {
  return sprintf('File "%s" for question "%s" not exists anymore. Please delete and re-upload the file.', $answer['fileName'] ?? $answer['uploadedFileId'], $question['text']);
  }