ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #5284 from nextcloud/bugfix/noid/no-token-session

Browse Source
This commit is contained in:
Julius Härtl
2023-11-13 14:03:53 +01:00
committed by GitHub
parent bd515c125e 4e10f80eb1
commit 030ad0f20d
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Controller/SessionController.php
View File

@@ -29,6 +29,8 @@ use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Service\PermissionService;
use OCA\Deck\Service\SessionService;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
use OCP\IRequest;
@@ -43,9 +45,7 @@ class SessionController extends OCSController {
parent::__construct($appName, $request);
}
/**
* @NoAdminRequired
*/
#[NoAdminRequired]
public function create(int $boardId): DataResponse {
$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
@@ -55,11 +55,7 @@ class SessionController extends OCSController {
]);
}
/**
* notifies the server that the session is still active
* @NoAdminRequired
* @param $boardId
*/
#[NoAdminRequired]
public function sync(int $boardId, string $token): DataResponse {
$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
try {
@@ -70,13 +66,12 @@ class SessionController extends OCSController {
}
}
/**
* delete a session if existing
* @NoAdminRequired
* @NoCSRFRequired
* @param $boardId
*/
public function close(int $boardId, string $token) {
#[NoAdminRequired]
#[NoCSRFRequired]
public function close(int $boardId, string $token = null): DataResponse {
if ($token === null) {
return new DataResponse();
}
$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
$this->sessionService->closeSession($boardId, $token);
return new DataResponse();

2
src/sessions.js
View File

@@ -117,7 +117,7 @@ export function createSession(boardId) {
// close session when tab gets hidden/inactive
const visibilitychangeListener = () => {
if (document.visibilityState === 'hidden') {
if (document.visibilityState === 'hidden' && token) {
sessionApi.closeSessionViaBeacon(boardId, token)
tokenPromise = null
token = null