upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 06:08:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

handle and return touchProvider errors

Browse source 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
This commit is contained in:
Julien Veyssier 2023-01-26 12:50:00 +01:00 committed by Julius Härtl
parent 48f34736cd
commit 8766e4f242
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/Controller/ReferenceApiController.php
View file

@ -97,8 +97,6 @@ class ReferenceApiController extends \OCP\AppFramework\OCSController {
/**
* @NoAdminRequired
*
* @return DataResponse
*/
public function getProvidersInfo(): DataResponse {
$providers = $this->referenceManager->getDiscoverableProviders();
@ -110,14 +108,12 @@ class ReferenceApiController extends \OCP\AppFramework\OCSController {
/**
* @NoAdminRequired
*
* @param string $providerId
* @return DataResponse
*/
public function touchProvider(string $providerId, ?int $timestamp = null): DataResponse {
if ($this->userId !== null) {
$this->referenceManager->touchProvider($this->userId, $providerId, $timestamp);
$success = $this->referenceManager->touchProvider($this->userId, $providerId, $timestamp);
return new DataResponse(['success' => $success]);
}
return new DataResponse(['success' => true]);
return new DataResponse(['success' => false]);
}
}

4
lib/private/Collaboration/Reference/ReferenceManager.php
View file

@ -242,7 +242,7 @@ class ReferenceManager implements IReferenceManager {
/**
* @inheritDoc
*/
public function touchProvider(string $userId, string $providerId, ?int $timestamp = null): void {
public function touchProvider(string $userId, string $providerId, ?int $timestamp = null): bool {
$providers = $this->getDiscoverableProviders();
$providerIds = array_map(static function (IDiscoverableReferenceProvider $provider) {
return $provider->getId();
@ -254,7 +254,9 @@ class ReferenceManager implements IReferenceManager {
}
$this->config->setUserValue($userId, 'references', $configKey, (string) $timestamp);
return true;
}
return false;
}
/**

4
lib/public/Collaboration/Reference/IReferenceManager.php
View file

@ -83,10 +83,10 @@ interface IReferenceManager {
* @param string $userId
* @param string $providerId
* @param int|null $timestamp use current timestamp if null
* @return void
* @return bool
* @since 26.0.0
*/
public function touchProvider(string $userId, string $providerId, ?int $timestamp = null): void;
public function touchProvider(string $userId, string $providerId, ?int $timestamp = null): bool;
/**
* Get all known last used timestamps for reference providers