NB-Public/circles
14
0
Fork 0
mirror of https://github.com/netzbegruenung/circles.git synced 2024-05-14 00:56:05 +02:00
Code Issues Projects Releases Wiki Activity

Use dependency injection

Browse source 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
This commit is contained in:
Carl Schwan 2022-03-11 11:25:24 +01:00
parent 9ff76b375f
commit 7c153fd166
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Controller/RemoteController.php
View file

@ -109,6 +109,8 @@ class RemoteController extends Controller {
/** @var ConfigService */
private $configService;
/** @var IUserSession */
private $userSession;
/**
* RemoteController constructor.
@ -136,7 +138,8 @@ class RemoteController extends Controller {
MemberService $memberService,
MembershipService $membershipService,
InterfaceService $interfaceService,
ConfigService $configService
ConfigService $configService,
IUserSession $userSession
) {
parent::__construct($appName, $request);
$this->circleRequest = $circleRequest;
@ -148,6 +151,7 @@ class RemoteController extends Controller {
$this->membershipService = $membershipService;
$this->interfaceService = $interfaceService;
$this->configService = $configService;
$this->userSession = $userSession;
$this->setup('app', 'circles');
$this->setupArray('enforceSignatureHeaders', ['digest', 'content-length']);
@ -550,8 +554,7 @@ class RemoteController extends Controller {
*/
private function publicPageJsonLimited(): void {
if (!$this->jsonRequested()) {
if (!OC::$server->get(IUserSession::class)
->isLoggedIn()) {
if (!$this->userSession->isLoggedIn()) {
throw new NotLoggedInException();
}
@ -580,8 +583,7 @@ class RemoteController extends Controller {
* @return bool
*/
private function areWithinAcceptHeader(array $needles): bool {
$request = OC::$server->get(IRequest::class);
$accepts = array_map([$this, 'trimHeader'], explode(',', $request->getHeader('Accept')));
$accepts = array_map([$this, 'trimHeader'], explode(',', $this->request->getHeader('Accept')));
foreach ($accepts as $accept) {
if (in_array($accept, $needles)) {