summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2017-03-22 14:47:07 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2017-03-24 10:58:10 +0100
commit8e89ad21a2dfa8f4f147225ae35cab83db4de2f9 (patch)
tree5c991eec18452d8da40ddedd6c8e372b77428223 /core
parent35d3a082f2a7256c104894faf6820a1410a0a38e (diff)
downloadnextcloud-server-8e89ad21a2dfa8f4f147225ae35cab83db4de2f9.tar.gz
nextcloud-server-8e89ad21a2dfa8f4f147225ae35cab83db4de2f9.zip
[PoC] JS Combiner
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'core')
-rw-r--r--core/Application.php10
-rw-r--r--core/Controller/JsController.php80
-rw-r--r--core/routes.php1
3 files changed, 91 insertions, 0 deletions
diff --git a/core/Application.php b/core/Application.php
index 6621964c289..33b7dd1b333 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -30,6 +30,8 @@
namespace OC\Core;
+use OC\AppFramework\Utility\SimpleContainer;
+use OC\Core\Controller\JsController;
use OC\Core\Controller\OCJSController;
use OC\Security\IdentityProof\Manager;
use OC\Server;
@@ -87,5 +89,13 @@ class Application extends App {
$server->getURLGenerator()
);
});
+ $container->registerService(JsController::class, function () use ($container) {
+ return new JsController(
+ $container->query('AppName'),
+ $container->query(IRequest::class),
+ $container->getServer()->getAppDataDir('js'),
+ $container->query(ITimeFactory::class)
+ );
+ });
}
}
diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php
new file mode 100644
index 00000000000..0770974e7a1
--- /dev/null
+++ b/core/Controller/JsController.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @copyright 2017, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Core\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\NotFoundResponse;
+use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\IRequest;
+
+class JsController extends Controller {
+
+ /** @var IAppData */
+ protected $appData;
+
+ /** @var ITimeFactory */
+ protected $timeFactory;
+
+ /**
+ * @param string $appName
+ * @param IRequest $request
+ * @param IAppData $appData
+ * @param ITimeFactory $timeFactory
+ */
+ public function __construct($appName, IRequest $request, IAppData $appData, ITimeFactory $timeFactory) {
+ parent::__construct($appName, $request);
+
+ $this->appData = $appData;
+ $this->timeFactory = $timeFactory;
+ }
+
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ *
+ * @param string $fileName css filename with extension
+ * @param string $appName css folder name
+ * @return FileDisplayResponse|NotFoundResponse
+ */
+ public function getJs($fileName, $appName) {
+ try {
+ $folder = $this->appData->getFolder($appName);
+ $jsFile = $folder->getFile($fileName);
+ } catch(NotFoundException $e) {
+ return new NotFoundResponse();
+ }
+
+ $response = new FileDisplayResponse($jsFile, Http::STATUS_OK, ['Content-Type' => 'application/javascript']);
+ $response->cacheFor(86400);
+ $expires = new \DateTime();
+ $expires->setTimestamp($this->timeFactory->getTime());
+ $expires->add(new \DateInterval('PT24H'));
+ $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+ $response->addHeader('Pragma', 'cache');
+ return $response;
+ }
+}
diff --git a/core/routes.php b/core/routes.php
index 5d61d58e037..d3356404fd5 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -56,6 +56,7 @@ $application->registerRoutes($this, [
['name' => 'Preview#getPreview', 'url' => '/core/preview', 'verb' => 'GET'],
['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
+ ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
],
'ocs' => [
['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],