From 19e52262551073849258f69dbfb9865d8e1767b8 Mon Sep 17 00:00:00 2001 From: Felix Rupp Date: Mon, 17 Aug 2020 15:29:25 +0200 Subject: [PATCH] Fix User commands, add changelog entry --- CHANGELOG.md | 7 +++++++ lib/Command/CreateUser.php | 3 ++- lib/Command/UpdateUser.php | 3 ++- lib/Service/AppService.php | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68930de..4fee1b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +Version 1.8.6 +------------- + +* Raises compatibility to ownCloud 10.5 and Nextcloud 19 +* Fixes a static file path to the CAS login button logo on ownCloud + + Version 1.8.5 ------------- diff --git a/lib/Command/CreateUser.php b/lib/Command/CreateUser.php index 2e653c9..fdeba20 100644 --- a/lib/Command/CreateUser.php +++ b/lib/Command/CreateUser.php @@ -89,9 +89,10 @@ public function __construct() $userSession = \OC::$server->getUserSession(); $logger = \OC::$server->getLogger(); $urlGenerator = \OC::$server->getURLGenerator(); + $appManager = \OC::$server->getAppManager(); $loggingService = new LoggingService('user_cas', $config, $logger); - $this->appService = new AppService('user_cas', $config, $loggingService, $userManager, $userSession, $urlGenerator); + $this->appService = new AppService('user_cas', $config, $loggingService, $userManager, $userSession, $urlGenerator, $appManager); $userService = new UserService( 'user_cas', diff --git a/lib/Command/UpdateUser.php b/lib/Command/UpdateUser.php index 2cca2b1..0e4c7cf 100644 --- a/lib/Command/UpdateUser.php +++ b/lib/Command/UpdateUser.php @@ -88,9 +88,10 @@ public function __construct() $userSession = \OC::$server->getUserSession(); $logger = \OC::$server->getLogger(); $urlGenerator = \OC::$server->getURLGenerator(); + $appManager = \OC::$server->getAppManager(); $loggingService = new LoggingService('user_cas', $config, $logger); - $this->appService = new AppService('user_cas', $config, $loggingService, $userManager, $userSession, $urlGenerator); + $this->appService = new AppService('user_cas', $config, $loggingService, $userManager, $userSession, $urlGenerator, $appManager); $userService = new UserService( 'user_cas', diff --git a/lib/Service/AppService.php b/lib/Service/AppService.php index e8c3e68..5ba801d 100644 --- a/lib/Service/AppService.php +++ b/lib/Service/AppService.php @@ -658,7 +658,6 @@ public function registerLogIn() if (!$loginAlreadyRegistered) {*/ - //TODO: get app path $loginAlternatives[] = ['href' => $this->linkToRoute($this->appName . '.authentication.casLogin'), 'name' => $loginButtonLabel, 'img' => $this->appManager->getAppWebPath($this->appName).'/img/cas-logo.png']; $this->config->setSystemValue('login.alternatives', $loginAlternatives);