Skip to content

Make dashboard installable as Chrome desktop PWA #23521

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

Closed
nhirokinet wants to merge 2 commits into from
Closed

Make dashboard installable as Chrome desktop PWA #23521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22fd24
Make dashboard installable as Chrome desktop PWA
nhirokinet Oct 16, 2020
d966779
Service-Worker-Allowed to be written by PHP
nhirokinet Nov 2, 2020
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
Prev Previous commit
Service-Worker-Allowed to be written by PHP 
Signed-off-by: nhirokinet <[email protected]>
  • Loading branch information
@nhirokinet
nhirokinet committed Nov 2, 2020
commit d9667791faf4c254b7a256479b7e1679b1241dae
31 changes: 30 additions & 1 deletion core/Controller/JsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\StreamResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\Files\SimpleFS\ISimpleFolder;
use OCP\IRequest;
use OCP\IURLGenerator;

class JsController extends Controller {

Expand All @@ -52,11 +54,15 @@ class JsController extends Controller {
/** @var ITimeFactory */
protected $timeFactory;

public function __construct($appName, IRequest $request, Factory $appDataFactory, ITimeFactory $timeFactory) {
/** @var IURLGenerator */
private $urlGenerator;

public function __construct($appName, IRequest $request, Factory $appDataFactory, ITimeFactory $timeFactory, IURLGenerator $urlGenerator) {
parent::__construct($appName, $request);

$this->appData = $appDataFactory->get('js');
$this->timeFactory = $timeFactory;
$this->urlGenerator = $urlGenerator;
}

/**
Expand Down Expand Up @@ -93,6 +99,29 @@ public function getJs(string $fileName, string $appName): Response {
return $response;
}

/**
* @PublicPage
* @NoCSRFRequired
* @NoSameSiteCookieRequired
*
* @return StreamResponse
*/
public function getServiceWorker(): Response {
$response = new StreamResponse(__DIR__ . '/../js/serviceworker_raw.js');

$ttl = 31536000;
$response->addHeader('Cache-Control', 'max-age='.$ttl.', immutable');
$response->addHeader('Content-Type', 'application/javascript');
$response->addHeader('Service-Worker-Allowed', $this->urlGenerator->getBaseUrl() . '/');

$expires = new \DateTime();
$expires->setTimestamp($this->timeFactory->getTime());
$expires->add(new \DateInterval('PT'.$ttl.'S'));
$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$response->addHeader('Pragma', 'cache');
return $response;
}

/**
* @param ISimpleFolder $folder
* @param string $fileName
Expand Down
2 changes: 1 addition & 1 deletion core/js/serviceworker_loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if ('serviceWorker' in navigator) {
window.addEventListener('load', function() {
navigator.serviceWorker.register(OC.getRootPath() + '/core/js/serviceworker.js', {scope: OC.getRootPath() + '/'});
navigator.serviceWorker.register(OC.getRootPath() + '/core/js/service-worker.js', {scope: OC.getRootPath() + '/'});
});
}
0 core/js/serviceworker.js → core/js/serviceworker_raw.js
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions core/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
['name' => 'TwoFactorChallenge#setupProvider', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'GET'],
['name' => 'TwoFactorChallenge#confirmProviderSetup', 'url' => 'login/setupchallenge/{providerId}', 'verb' => 'POST'],
['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
['name' => 'Js#getServiceWorker', 'url' => '/core/js/service-worker.js', 'verb' => 'GET'],
['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
['name' => 'RecommendedApps#index', 'url' => '/core/apps/recommended', 'verb' => 'GET'],
Expand Down