Skip to content
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

[TASK] Improve handling of storage proxy #775

Merged
merged 1 commit into from
Sep 18, 2024
Merged

[TASK] Improve handling of storage proxy #775

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
17 changes: 16 additions & 1 deletion Classes/XClass/ResourceLocalDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use FriendsOfTYPO3\Headless\Utility\UrlUtility;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\Http\ApplicationType;
use TYPO3\CMS\Core\Http\Uri;
use TYPO3\CMS\Core\Resource\Driver\LocalDriver;
use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
Expand Down Expand Up @@ -42,7 +43,21 @@ protected function determineBaseUrl(): void

if ($this->hasCapability(ResourceStorage::CAPABILITY_PUBLIC)) {
$urlUtility = GeneralUtility::makeInstance(UrlUtility::class)->withRequest($request);
$this->configuration['baseUri'] = $urlUtility->getStorageProxyUrl();

$basePath = match (true) {
(($this->configuration['baseUri'] ?? '') !== '') => $this->configuration['baseUri'],
(($this->configuration['basePath'] ?? '') !== '' && $this->configuration['pathType'] === 'relative') => $this->configuration['basePath'],
default => '',
};

if ($basePath !== '') {
$frontendUri = (new Uri($urlUtility->getFrontendUrl()));

$path = new Uri(trim($basePath, '/'));
$this->configuration['baseUri'] = (string)$frontendUri->withPath('/' . trim((new Uri($urlUtility->getProxyUrl()))->getPath(), '/') . '/' . trim($path->getPath(), '/'));
} else {
$this->configuration['baseUri'] = $urlUtility->getStorageProxyUrl();
}
}

parent::determineBaseUrl();
Expand Down