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

Move circle checks to a unified service and improve member checks

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2021-07-12 17:55:53 +02:00
committed by Julius Härtl (Rebase PR Action)
parent 5f4aa017b6
commit 958d50d9b7
4 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Service/CirclesService.php
View File

@@ -26,6 +26,8 @@ declare(strict_types=1);
namespace OCA\Deck\Service;
use OCA\Circles\CirclesManager;
use OCA\Circles\Model\Member;
use OCP\App\IAppManager;
/**
@@ -39,6 +41,10 @@ class CirclesService {
$this->circlesEnabled = $appManager->isEnabledForUser('circles');
}
public function isCirclesEnabled(): bool {
return $this->circlesEnabled;
}
public function getCircle($circleId) {
if (!$this->circlesEnabled) {
return null;
@@ -53,8 +59,13 @@ class CirclesService {
}
try {
\OCA\Circles\Api\v1\Circles::getMember($circleId, $userId, 1, true);
return true;
/** @var CirclesManager $circlesManager */
$circlesManager = \OC::$server->get(CirclesManager::class);
$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
$circlesManager->startSession($federatedUser);
$circle = $circlesManager->getCircle($circleId);
$member = $circle->getInitiator();
return $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
} catch (\Exception $e) {
}
return false;