@@ -26,137 +26,137 @@ |
||
26 | 26 | use Symfony\Component\Routing\Annotation\Route; |
27 | 27 | |
28 | 28 | class StaticThemeAssetsController extends Controller { |
29 | - /** |
|
30 | - * Directory with assets inside theme. |
|
31 | - */ |
|
32 | - const ASSETS_DIRECTORY = 'public'; |
|
33 | - |
|
34 | - private TenantAwareThemeContextInterface $tenantAwareThemeContext; |
|
35 | - private ThemeLoaderInterface $themeLoader; |
|
36 | - private ThemeRepositoryInterface $themeRepository; |
|
37 | - |
|
38 | - /** |
|
39 | - * @param TenantAwareThemeContextInterface $tenantAwareThemeContext |
|
40 | - * @param ThemeLoaderInterface $themeLoader |
|
41 | - * @param ThemeRepositoryInterface $themeRepository |
|
42 | - */ |
|
43 | - public function __construct(TenantAwareThemeContextInterface $tenantAwareThemeContext, |
|
44 | - ThemeLoaderInterface $themeLoader, |
|
45 | - ThemeRepositoryInterface $themeRepository) { |
|
29 | + /** |
|
30 | + * Directory with assets inside theme. |
|
31 | + */ |
|
32 | + const ASSETS_DIRECTORY = 'public'; |
|
33 | + |
|
34 | + private TenantAwareThemeContextInterface $tenantAwareThemeContext; |
|
35 | + private ThemeLoaderInterface $themeLoader; |
|
36 | + private ThemeRepositoryInterface $themeRepository; |
|
37 | + |
|
38 | + /** |
|
39 | + * @param TenantAwareThemeContextInterface $tenantAwareThemeContext |
|
40 | + * @param ThemeLoaderInterface $themeLoader |
|
41 | + * @param ThemeRepositoryInterface $themeRepository |
|
42 | + */ |
|
43 | + public function __construct(TenantAwareThemeContextInterface $tenantAwareThemeContext, |
|
44 | + ThemeLoaderInterface $themeLoader, |
|
45 | + ThemeRepositoryInterface $themeRepository) { |
|
46 | 46 | $this->tenantAwareThemeContext = $tenantAwareThemeContext; |
47 | 47 | $this->themeLoader = $themeLoader; |
48 | 48 | $this->themeRepository = $themeRepository; |
49 | - } |
|
49 | + } |
|
50 | 50 | |
51 | 51 | |
52 | - /** |
|
53 | - * @Route("/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root", requirements={"fileName": "sw|manifest|favicon|ads|OneSignalSDKWorker|OneSignalSDKUpdaterWorker|amp-web-push-helper-frame|amp-web-push-permission-dialog"}) |
|
54 | - * @Route("/public-{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root_public", requirements={"fileName"=".+"}) |
|
55 | - * @Route("/public/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_public", requirements={"fileName"=".+"}) |
|
56 | - */ |
|
57 | - public function rootAction($fileName, $fileExtension, ThemeHierarchyProviderInterface $themeHierarchyProvider) { |
|
52 | + /** |
|
53 | + * @Route("/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root", requirements={"fileName": "sw|manifest|favicon|ads|OneSignalSDKWorker|OneSignalSDKUpdaterWorker|amp-web-push-helper-frame|amp-web-push-permission-dialog"}) |
|
54 | + * @Route("/public-{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_root_public", requirements={"fileName"=".+"}) |
|
55 | + * @Route("/public/{fileName}.{fileExtension}", methods={"GET"}, name="static_theme_assets_public", requirements={"fileName"=".+"}) |
|
56 | + */ |
|
57 | + public function rootAction($fileName, $fileExtension, ThemeHierarchyProviderInterface $themeHierarchyProvider) { |
|
58 | 58 | $themes = $themeHierarchyProvider->getThemeHierarchy( |
59 | 59 | $this->tenantAwareThemeContext->getTheme() |
60 | 60 | ); |
61 | 61 | |
62 | 62 | $fileName = (null === $fileExtension) ? basename($fileName) : $fileName . '.' . $fileExtension; |
63 | 63 | foreach ($themes as $theme) { |
64 | - $filePath = $theme->getPath() . '/' . self::ASSETS_DIRECTORY . '/' . $fileName; |
|
65 | - if (null !== $response = $this->handleFileLoading($filePath)) { |
|
64 | + $filePath = $theme->getPath() . '/' . self::ASSETS_DIRECTORY . '/' . $fileName; |
|
65 | + if (null !== $response = $this->handleFileLoading($filePath)) { |
|
66 | 66 | return $response; |
67 | - } |
|
67 | + } |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | throw new NotFoundHttpException('File was not found.'); |
71 | - } |
|
72 | - |
|
73 | - /** |
|
74 | - * @Route("/themes/{type}/{themeName}/screenshots/{fileName}", methods={"GET"}, name="static_theme_screenshots", requirements={ |
|
75 | - * "type": "organization|tenant" |
|
76 | - * }) |
|
77 | - */ |
|
78 | - public function screenshotsAction(string $type, string $themeName, $fileName) { |
|
71 | + } |
|
72 | + |
|
73 | + /** |
|
74 | + * @Route("/themes/{type}/{themeName}/screenshots/{fileName}", methods={"GET"}, name="static_theme_screenshots", requirements={ |
|
75 | + * "type": "organization|tenant" |
|
76 | + * }) |
|
77 | + */ |
|
78 | + public function screenshotsAction(string $type, string $themeName, $fileName) { |
|
79 | 79 | if ('organization' === $type) { |
80 | - $theme = $this->loadOrganizationTheme(str_replace('__', '/', $themeName)); |
|
80 | + $theme = $this->loadOrganizationTheme(str_replace('__', '/', $themeName)); |
|
81 | 81 | } elseif ('tenant' === $type) { |
82 | - $theme = $this->loadTenantTheme(str_replace('__', '/', $themeName)); |
|
82 | + $theme = $this->loadTenantTheme(str_replace('__', '/', $themeName)); |
|
83 | 83 | } else { |
84 | - throw new NotFoundHttpException('File was not found.'); |
|
84 | + throw new NotFoundHttpException('File was not found.'); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | $filePath = $theme->getPath() . '/screenshots/' . $fileName; |
88 | 88 | if (null !== $response = $this->handleFileLoading($filePath)) { |
89 | - return $response; |
|
89 | + return $response; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | throw new NotFoundHttpException('File was not found.'); |
93 | - } |
|
94 | - |
|
95 | - /** |
|
96 | - * @param $filePath |
|
97 | - * |
|
98 | - * @return Response |
|
99 | - */ |
|
100 | - private function handleFileLoading($filePath) { |
|
93 | + } |
|
94 | + |
|
95 | + /** |
|
96 | + * @param $filePath |
|
97 | + * |
|
98 | + * @return Response |
|
99 | + */ |
|
100 | + private function handleFileLoading($filePath) { |
|
101 | 101 | if (file_exists($filePath)) { |
102 | - $response = new Response(file_get_contents($filePath)); |
|
103 | - $disposition = $response->headers->makeDisposition( |
|
104 | - ResponseHeaderBag::DISPOSITION_INLINE, |
|
105 | - basename($filePath) |
|
106 | - ); |
|
107 | - $response->headers->set('Content-Disposition', $disposition); |
|
108 | - |
|
109 | - try { |
|
110 | - $mime = MimeTypeHelper::getByPath($filePath); |
|
111 | - } catch (\Exception $e) { |
|
102 | + $response = new Response(file_get_contents($filePath)); |
|
103 | + $disposition = $response->headers->makeDisposition( |
|
104 | + ResponseHeaderBag::DISPOSITION_INLINE, |
|
105 | + basename($filePath) |
|
106 | + ); |
|
107 | + $response->headers->set('Content-Disposition', $disposition); |
|
108 | + |
|
109 | + try { |
|
110 | + $mime = MimeTypeHelper::getByPath($filePath); |
|
111 | + } catch (\Exception $e) { |
|
112 | 112 | $mime = 'text/plain'; |
113 | - } |
|
113 | + } |
|
114 | 114 | |
115 | - $response->headers->set('Content-Type', $mime); |
|
116 | - $response->setStatusCode(Response::HTTP_OK); |
|
117 | - $response->setPublic(); |
|
118 | - $response->setMaxAge(3600); |
|
119 | - $response->setSharedMaxAge(7200); |
|
115 | + $response->headers->set('Content-Type', $mime); |
|
116 | + $response->setStatusCode(Response::HTTP_OK); |
|
117 | + $response->setPublic(); |
|
118 | + $response->setMaxAge(3600); |
|
119 | + $response->setSharedMaxAge(7200); |
|
120 | 120 | |
121 | - return $response; |
|
121 | + return $response; |
|
122 | + } |
|
122 | 123 | } |
123 | - } |
|
124 | 124 | |
125 | - /** |
|
126 | - * @return mixed |
|
127 | - */ |
|
128 | - private function loadOrganizationTheme(string $themeName) { |
|
125 | + /** |
|
126 | + * @return mixed |
|
127 | + */ |
|
128 | + private function loadOrganizationTheme(string $themeName) { |
|
129 | 129 | $loadedThemes = $this->themeLoader->load(); |
130 | 130 | |
131 | 131 | return $this->filterThemes($loadedThemes, $themeName); |
132 | - } |
|
132 | + } |
|
133 | 133 | |
134 | - /** |
|
135 | - * @return mixed |
|
136 | - */ |
|
137 | - private function loadTenantTheme(string $themeName) { |
|
134 | + /** |
|
135 | + * @return mixed |
|
136 | + */ |
|
137 | + private function loadTenantTheme(string $themeName) { |
|
138 | 138 | $loadedThemes = $this->themeRepository->findAll(); |
139 | 139 | |
140 | 140 | return $this->filterThemes($loadedThemes, $themeName); |
141 | - } |
|
142 | - |
|
143 | - /** |
|
144 | - * @param array $loadedThemes |
|
145 | - * |
|
146 | - * @return mixed |
|
147 | - */ |
|
148 | - private function filterThemes($loadedThemes, string $themeName) { |
|
141 | + } |
|
142 | + |
|
143 | + /** |
|
144 | + * @param array $loadedThemes |
|
145 | + * |
|
146 | + * @return mixed |
|
147 | + */ |
|
148 | + private function filterThemes($loadedThemes, string $themeName) { |
|
149 | 149 | $themes = array_filter( |
150 | 150 | $loadedThemes, |
151 | 151 | function ($element) use (&$themeName) { |
152 | - return $element->getName() === $themeName; |
|
152 | + return $element->getName() === $themeName; |
|
153 | 153 | } |
154 | 154 | ); |
155 | 155 | |
156 | 156 | if (0 === count($themes)) { |
157 | - throw new NotFoundHttpException(sprintf('Theme with name "%s" was not found in organization themes.', $themeName)); |
|
157 | + throw new NotFoundHttpException(sprintf('Theme with name "%s" was not found in organization themes.', $themeName)); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | return reset($themes); |
161 | - } |
|
161 | + } |
|
162 | 162 | } |
@@ -29,50 +29,50 @@ |
||
29 | 29 | |
30 | 30 | class ThemeLogoController extends Controller { |
31 | 31 | |
32 | - private Filesystem $filesystem; |
|
33 | - private ThemeLogoUploaderInterface $themeLogoUploader; |
|
34 | - private CacheInterface $cacheInterface; |
|
32 | + private Filesystem $filesystem; |
|
33 | + private ThemeLogoUploaderInterface $themeLogoUploader; |
|
34 | + private CacheInterface $cacheInterface; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param Filesystem $filesystem |
|
38 | - * @param ThemeLogoUploaderInterface $themeLogoUploader |
|
39 | - * @param CacheInterface $cacheInterface |
|
40 | - */ |
|
41 | - public function __construct(Filesystem $filesystem, ThemeLogoUploaderInterface $themeLogoUploader, |
|
42 | - CacheInterface $cacheInterface) { |
|
36 | + /** |
|
37 | + * @param Filesystem $filesystem |
|
38 | + * @param ThemeLogoUploaderInterface $themeLogoUploader |
|
39 | + * @param CacheInterface $cacheInterface |
|
40 | + */ |
|
41 | + public function __construct(Filesystem $filesystem, ThemeLogoUploaderInterface $themeLogoUploader, |
|
42 | + CacheInterface $cacheInterface) { |
|
43 | 43 | $this->filesystem = $filesystem; |
44 | 44 | $this->themeLogoUploader = $themeLogoUploader; |
45 | 45 | $this->cacheInterface = $cacheInterface; |
46 | - } |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @Route("/theme_logo/{id}", options={"expose"=true}, requirements={"id"=".+"}, methods={"GET"}, name="swp_theme_logo_get") |
|
50 | - */ |
|
51 | - public function getLogoAction(string $id) { |
|
48 | + /** |
|
49 | + * @Route("/theme_logo/{id}", options={"expose"=true}, requirements={"id"=".+"}, methods={"GET"}, name="swp_theme_logo_get") |
|
50 | + */ |
|
51 | + public function getLogoAction(string $id) { |
|
52 | 52 | $cacheKey = md5(serialize(['upload', $id])); |
53 | 53 | return $this->cacheInterface->get($cacheKey, function (CacheItemInterface $item, &$save) use ($id) { |
54 | - $item->expiresAfter(63072000); |
|
54 | + $item->expiresAfter(63072000); |
|
55 | 55 | |
56 | - $fileSystem = $this->filesystem; |
|
57 | - $themeLogoUploader = $this->themeLogoUploader; |
|
58 | - $id = $themeLogoUploader->getThemeLogoUploadPath($id); |
|
59 | - $file = $fileSystem->has($id); |
|
60 | - if (!$file) { |
|
56 | + $fileSystem = $this->filesystem; |
|
57 | + $themeLogoUploader = $this->themeLogoUploader; |
|
58 | + $id = $themeLogoUploader->getThemeLogoUploadPath($id); |
|
59 | + $file = $fileSystem->has($id); |
|
60 | + if (!$file) { |
|
61 | 61 | $save = false; |
62 | 62 | throw new NotFoundHttpException('File was not found.'); |
63 | - } |
|
63 | + } |
|
64 | 64 | |
65 | - $path = $fileSystem->get($id)->getPath(); |
|
66 | - $response = new Response(); |
|
67 | - $disposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_INLINE, pathinfo($path, PATHINFO_BASENAME)); |
|
68 | - $response->headers->set('Content-Disposition', $disposition); |
|
69 | - $response->headers->set('Content-Type', MimeTypeHelper::getByPath($path)); |
|
70 | - $response->setPublic(); |
|
71 | - $response->setMaxAge(63072000); |
|
72 | - $response->setSharedMaxAge(63072000); |
|
73 | - $response->setContent($fileSystem->read($path)); |
|
65 | + $path = $fileSystem->get($id)->getPath(); |
|
66 | + $response = new Response(); |
|
67 | + $disposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_INLINE, pathinfo($path, PATHINFO_BASENAME)); |
|
68 | + $response->headers->set('Content-Disposition', $disposition); |
|
69 | + $response->headers->set('Content-Type', MimeTypeHelper::getByPath($path)); |
|
70 | + $response->setPublic(); |
|
71 | + $response->setMaxAge(63072000); |
|
72 | + $response->setSharedMaxAge(63072000); |
|
73 | + $response->setContent($fileSystem->read($path)); |
|
74 | 74 | |
75 | - return $response; |
|
75 | + return $response; |
|
76 | 76 | }); |
77 | - } |
|
77 | + } |
|
78 | 78 | } |