From 53a88734d2cbabd37d79d67737e1c204f0c018f3 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Wed, 7 Apr 2021 21:52:53 +0200 Subject: [PATCH 1/3] updated constructors for nextcloud 21 compatibility --- Dockerfile | 2 +- solid/lib/Controller/AppController.php | 4 ++-- solid/lib/Controller/CalendarController.php | 4 ++-- solid/lib/Controller/ContactsController.php | 4 ++-- solid/lib/Controller/PageController.php | 4 ++-- solid/lib/Controller/ProfileController.php | 4 ++-- solid/lib/Controller/ServerController.php | 4 ++-- solid/lib/Controller/StorageController.php | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30f86bc5..51d3b0ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:20 +FROM nextcloud:latest COPY site.conf /etc/apache2/sites-enabled/000-default.conf RUN a2enmod ssl RUN mkdir /tls diff --git a/solid/lib/Controller/AppController.php b/solid/lib/Controller/AppController.php index 8d43c6b3..10ea6e2d 100644 --- a/solid/lib/Controller/AppController.php +++ b/solid/lib/Controller/AppController.php @@ -19,14 +19,14 @@ class AppController extends Controller { private $urlGenerator; private $config; - public function __construct($AppName, IRequest $request, ServerConfig $config, IUserManager $userManager, IManager $contactsManager, IURLGenerator $urlGenerator, $userId){ + public function __construct($AppName, IRequest $request, IConfig $config, IUserManager $userManager, IManager $contactsManager, IURLGenerator $urlGenerator, $userId){ parent::__construct($AppName, $request); $this->userId = $userId; $this->userManager = $userManager; $this->contactsManager = $contactsManager; $this->request = $request; $this->urlGenerator = $urlGenerator; - $this->config = $config; + $this->config = new \OCA\Solid\ServerConfig($config, $urlGenerator, $userManager); } private function getUserApps($userId) { diff --git a/solid/lib/Controller/CalendarController.php b/solid/lib/Controller/CalendarController.php index 39c63140..98d4ee9a 100644 --- a/solid/lib/Controller/CalendarController.php +++ b/solid/lib/Controller/CalendarController.php @@ -25,11 +25,11 @@ class CalendarController extends Controller { /* @var ISession */ private $session; - public function __construct($AppName, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, ServerConfig $config, \OCA\Solid\Service\UserService $UserService) + public function __construct($AppName, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, IConfig $config, \OCA\Solid\Service\UserService $UserService) { parent::__construct($AppName, $request); require_once(__DIR__.'/../../vendor/autoload.php'); - $this->config = $config; + $this->config = new \OCA\Solid\ServerConfig($config, $urlGenerator, $userManager); $this->request = $request; $this->urlGenerator = $urlGenerator; $this->session = $session; diff --git a/solid/lib/Controller/ContactsController.php b/solid/lib/Controller/ContactsController.php index 436393ce..9b751e89 100644 --- a/solid/lib/Controller/ContactsController.php +++ b/solid/lib/Controller/ContactsController.php @@ -25,11 +25,11 @@ class ContactsController extends Controller { /* @var ISession */ private $session; - public function __construct($AppName, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, ServerConfig $config, \OCA\Solid\Service\UserService $UserService) + public function __construct($AppName, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, IConfig $config, \OCA\Solid\Service\UserService $UserService) { parent::__construct($AppName, $request); require_once(__DIR__.'/../../vendor/autoload.php'); - $this->config = $config; + $this->config = new \OCA\Solid\ServerConfig($config, $urlGenerator, $userManager); $this->request = $request; $this->urlGenerator = $urlGenerator; $this->session = $session; diff --git a/solid/lib/Controller/PageController.php b/solid/lib/Controller/PageController.php index 1e88720a..62ba0237 100644 --- a/solid/lib/Controller/PageController.php +++ b/solid/lib/Controller/PageController.php @@ -17,14 +17,14 @@ class PageController extends Controller { private $urlGenerator; private $config; - public function __construct($AppName, IRequest $request, ServerConfig $config, IUserManager $userManager, IURLGenerator $urlGenerator, $userId){ + public function __construct($AppName, IRequest $request, IConfig $config, IUserManager $userManager, IURLGenerator $urlGenerator, $userId){ parent::__construct($AppName, $request); require_once(__DIR__.'/../../vendor/autoload.php'); $this->userId = $userId; $this->userManager = $userManager; $this->request = $request; $this->urlGenerator = $urlGenerator; - $this->config = $config; + $this->config = new \OCA\Solid\ServerConfig($config, $urlGenerator, $userManager); } /** diff --git a/solid/lib/Controller/ProfileController.php b/solid/lib/Controller/ProfileController.php index 2fa19f5f..f5aee504 100644 --- a/solid/lib/Controller/ProfileController.php +++ b/solid/lib/Controller/ProfileController.php @@ -27,11 +27,11 @@ class ProfileController extends Controller { /* @var ISession */ private $session; - public function __construct($AppName, IRequest $request, ISession $session, IManager $contactsManager, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, ServerConfig $config, \OCA\Solid\Service\UserService $UserService) + public function __construct($AppName, IRequest $request, ISession $session, IManager $contactsManager, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, IConfig $config, \OCA\Solid\Service\UserService $UserService) { parent::__construct($AppName, $request); require_once(__DIR__.'/../../vendor/autoload.php'); - $this->config = $config; + $this->config = new \OCA\Solid\ServerConfig($config, $urlGenerator, $userManager); $this->request = $request; $this->urlGenerator = $urlGenerator; $this->userManager = $userManager; diff --git a/solid/lib/Controller/ServerController.php b/solid/lib/Controller/ServerController.php index a1a893b9..f945f874 100644 --- a/solid/lib/Controller/ServerController.php +++ b/solid/lib/Controller/ServerController.php @@ -38,11 +38,11 @@ class ServerController extends Controller { /* @var Pdsinterop\Solid\Auth\TokenGenerator */ private $tokenGenerator; - public function __construct($AppName, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, ServerConfig $config, \OCA\Solid\Service\UserService $UserService) + public function __construct($AppName, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, IConfig $config, \OCA\Solid\Service\UserService $UserService) { parent::__construct($AppName, $request); require_once(__DIR__.'/../../vendor/autoload.php'); - $this->config = $config; + $this->config = new \OCA\Solid\ServerConfig($config, $urlGenerator, $userManager); $this->userId = $userId; $this->userManager = $userManager; $this->request = $request; diff --git a/solid/lib/Controller/StorageController.php b/solid/lib/Controller/StorageController.php index 93d0b29c..3df15b4f 100644 --- a/solid/lib/Controller/StorageController.php +++ b/solid/lib/Controller/StorageController.php @@ -27,11 +27,11 @@ class StorageController extends Controller { /* @var ISession */ private $session; - public function __construct($AppName, IRootFolder $rootFolder, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, ServerConfig $config, \OCA\Solid\Service\UserService $UserService) + public function __construct($AppName, IRootFolder $rootFolder, IRequest $request, ISession $session, IUserManager $userManager, IURLGenerator $urlGenerator, $userId, IConfig $config, \OCA\Solid\Service\UserService $UserService) { parent::__construct($AppName, $request); require_once(__DIR__.'/../../vendor/autoload.php'); - $this->config = $config; + $this->config = new \OCA\Solid\ServerConfig($config, $urlGenerator, $userManager); $this->rootFolder = $rootFolder; $this->request = $request; $this->urlGenerator = $urlGenerator; From 1f9adb7b5844c16369cc64265aa97cfad6081176 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Wed, 7 Apr 2021 22:15:21 +0200 Subject: [PATCH 2/3] add IConfig to controllers --- solid/lib/Controller/AppController.php | 1 + solid/lib/Controller/CalendarController.php | 1 + solid/lib/Controller/ContactsController.php | 1 + solid/lib/Controller/PageController.php | 2 ++ solid/lib/Controller/ProfileController.php | 1 + solid/lib/Controller/ServerController.php | 2 ++ solid/lib/Controller/StorageController.php | 2 ++ 7 files changed, 10 insertions(+) diff --git a/solid/lib/Controller/AppController.php b/solid/lib/Controller/AppController.php index 10ea6e2d..f5006d42 100644 --- a/solid/lib/Controller/AppController.php +++ b/solid/lib/Controller/AppController.php @@ -6,6 +6,7 @@ use OCP\IUserManager; use OCP\Contacts\IManager; use OCP\IURLGenerator; +use OCP\IConfig; use OCP\AppFramework\Http; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\DataResponse; diff --git a/solid/lib/Controller/CalendarController.php b/solid/lib/Controller/CalendarController.php index 98d4ee9a..65c26d43 100644 --- a/solid/lib/Controller/CalendarController.php +++ b/solid/lib/Controller/CalendarController.php @@ -8,6 +8,7 @@ use OCP\IUserManager; use OCP\IURLGenerator; use OCP\ISession; +use OCP\IConfig; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; diff --git a/solid/lib/Controller/ContactsController.php b/solid/lib/Controller/ContactsController.php index 9b751e89..ed236210 100644 --- a/solid/lib/Controller/ContactsController.php +++ b/solid/lib/Controller/ContactsController.php @@ -8,6 +8,7 @@ use OCP\IUserManager; use OCP\IURLGenerator; use OCP\ISession; +use OCP\IConfig; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; diff --git a/solid/lib/Controller/PageController.php b/solid/lib/Controller/PageController.php index 62ba0237..0d723a06 100644 --- a/solid/lib/Controller/PageController.php +++ b/solid/lib/Controller/PageController.php @@ -5,6 +5,8 @@ use OCP\IRequest; use OCP\IUserManager; use OCP\IURLGenerator; +use OCP\IConfig; + use OCP\AppFramework\Http; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Controller; diff --git a/solid/lib/Controller/ProfileController.php b/solid/lib/Controller/ProfileController.php index f5aee504..2f243984 100644 --- a/solid/lib/Controller/ProfileController.php +++ b/solid/lib/Controller/ProfileController.php @@ -9,6 +9,7 @@ use OCP\Contacts\IManager; use OCP\IURLGenerator; use OCP\ISession; +use OCP\IConfig; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Response; diff --git a/solid/lib/Controller/ServerController.php b/solid/lib/Controller/ServerController.php index f945f874..ffc4591e 100644 --- a/solid/lib/Controller/ServerController.php +++ b/solid/lib/Controller/ServerController.php @@ -6,6 +6,8 @@ use OCP\IUserManager; use OCP\IURLGenerator; use OCP\ISession; +use OCP\IConfig; + use OCP\AppFramework\Http; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\JSONResponse; diff --git a/solid/lib/Controller/StorageController.php b/solid/lib/Controller/StorageController.php index 3df15b4f..8bd0794b 100644 --- a/solid/lib/Controller/StorageController.php +++ b/solid/lib/Controller/StorageController.php @@ -8,6 +8,8 @@ use OCP\IUserManager; use OCP\IURLGenerator; use OCP\ISession; +use OCP\IConfig; + use OCP\Files\IRootFolder; use OCP\Files\IHomeStorage; use OCP\Files\SimpleFS\ISimpleRoot; From 6b92bcdefba7e096c38a1374057f9d162f188c90 Mon Sep 17 00:00:00 2001 From: Yvo Brevoort Date: Wed, 14 Apr 2021 16:28:03 +0200 Subject: [PATCH 3/3] add redirect uris to existing registration --- solid/lib/ServerConfig.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/solid/lib/ServerConfig.php b/solid/lib/ServerConfig.php index 536e797e..98d88ccd 100644 --- a/solid/lib/ServerConfig.php +++ b/solid/lib/ServerConfig.php @@ -142,8 +142,11 @@ public function removeAllowedClient($userId, $clientId) { public function saveClientRegistration($origin, $clientData) { $originHash = md5($origin); $existingRegistration = $this->getClientRegistration($originHash); - if ($existingRegistration && isset($existingRegistration['client_name'])) { - return $originHash; + if ($existingRegistration && isset($existingRegistration['redirect_uris'])) { + foreach ($existingRegistration['redirect_uris'] as $uri) { + $clientData['redirect_uris'][] = $uri; + } + $clientData['redirect_uris'] = array_unique($clientData['redirect_uris']); } $clientData['client_name'] = $origin;