Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 3 additions & 2 deletions solid/lib/Controller/AppController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,14 +20,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) {
Expand Down
5 changes: 3 additions & 2 deletions solid/lib/Controller/CalendarController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,11 +26,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;
Expand Down
5 changes: 3 additions & 2 deletions solid/lib/Controller/ContactsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,11 +26,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;
Expand Down
6 changes: 4 additions & 2 deletions solid/lib/Controller/PageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,14 +19,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);
}

/**
Expand Down
5 changes: 3 additions & 2 deletions solid/lib/Controller/ProfileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,11 +28,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;
Expand Down
6 changes: 4 additions & 2 deletions solid/lib/Controller/ServerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -38,11 +40,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;
Expand Down
6 changes: 4 additions & 2 deletions solid/lib/Controller/StorageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,11 +29,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;
Expand Down
7 changes: 5 additions & 2 deletions solid/lib/ServerConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down