ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert lazy use of userId in ConfigService

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2022-05-12 11:11:45 +02:00
parent 3a783a722a
commit ce7da62a88
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Service/ConfigService.php
View File

@@ -32,6 +32,7 @@ use OCA\Deck\NoPermissionException;
use OCP\IConfig; use OCP\IConfig;
use OCP\IGroup; use OCP\IGroup;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IUserSession;
class ConfigService { class ConfigService {
public const SETTING_BOARD_NOTIFICATION_DUE_OFF = 'off'; public const SETTING_BOARD_NOTIFICATION_DUE_OFF = 'off';
@@ -40,20 +41,25 @@ class ConfigService {
public const SETTING_BOARD_NOTIFICATION_DUE_DEFAULT = self::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED; public const SETTING_BOARD_NOTIFICATION_DUE_DEFAULT = self::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED;
private IConfig $config; private IConfig $config;
private ?string $userId; private ?string $userId = null;
private IGroupManager $groupManager; private IGroupManager $groupManager;
public function __construct( public function __construct(
IConfig $config, IConfig $config,
IGroupManager $groupManager, IGroupManager $groupManager
?string $userId
) { ) {
$this->groupManager = $groupManager; $this->groupManager = $groupManager;
$this->config = $config; $this->config = $config;
$this->userId = $userId;
} }
public function getUserId(): ?string { public function getUserId(): ?string {
if (!$this->userId) {
// We cannot use DI for the userId or UserSession as the ConfigService
// is initiated too early before the session is actually loaded
$user = \OCP\Server::get(IUserSession::class)->getUser();
$this->userId = $user ? $user->getUID() : null;
}
return $this->userId; return $this->userId;
} }

2
tests/integration/app/AppTest.php
View File

@@ -34,7 +34,7 @@ class AppTest extends TestCase {
public function setUp(): void { public function setUp(): void {
parent::setUp(); parent::setUp();
$this->app = new \OCA\Deck\AppInfo\Application(); $this->app = \OCP\Server::get(\OCA\Deck\AppInfo\Application::class);
$this->container = $this->app->getContainer(); $this->container = $this->app->getContainer();
} }