Skip to content

Commit

Permalink
Fix User commands, add changelog entry
Browse files Browse the repository at this point in the history
  • Loading branch information
felixrupp committed Aug 17, 2020
1 parent b3ea35d commit 19e5226
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
-------------

Expand Down
3 changes: 2 additions & 1 deletion lib/Command/CreateUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion lib/Command/UpdateUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion lib/Service/AppService.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 19e5226

Please sign in to comment.