diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php
index 077cc4c47adc0..2acb0e81c00d2 100644
--- a/apps/admin_audit/lib/AppInfo/Application.php
+++ b/apps/admin_audit/lib/AppInfo/Application.php
@@ -36,6 +36,7 @@
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\AppFramework\Services\IAppConfig;
use OCP\Authentication\Events\AnyLoginFailedEvent;
use OCP\Authentication\TwoFactorAuth\TwoFactorProviderChallengeFailed;
use OCP\Authentication\TwoFactorAuth\TwoFactorProviderChallengePassed;
@@ -81,7 +82,7 @@ public function __construct() {
public function register(IRegistrationContext $context): void {
$context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
- return new AuditLogger($c->get(ILogFactory::class), $c->get(IConfig::class));
+ return new AuditLogger($c->get(ILogFactory::class), $c->get(IAppConfig::class), $c->get(IConfig::class));
});
$context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
diff --git a/apps/admin_audit/lib/AuditLogger.php b/apps/admin_audit/lib/AuditLogger.php
index a622794dc0835..c3463bf808b08 100644
--- a/apps/admin_audit/lib/AuditLogger.php
+++ b/apps/admin_audit/lib/AuditLogger.php
@@ -9,6 +9,7 @@
namespace OCA\AdminAudit;
+use OCP\AppFramework\Services\IAppConfig;
use OCP\IConfig;
use OCP\Log\ILogFactory;
use Psr\Log\LoggerInterface;
@@ -20,7 +21,11 @@ class AuditLogger implements IAuditLogger {
private LoggerInterface $parentLogger;
- public function __construct(ILogFactory $logFactory, IConfig $config) {
+ public function __construct(
+ ILogFactory $logFactory,
+ IAppConfig $appConfig,
+ IConfig $config,
+ ) {
$auditType = $config->getSystemValueString('log_type_audit', 'file');
$defaultTag = $config->getSystemValueString('syslog_tag', 'Nextcloud');
$auditTag = $config->getSystemValueString('syslog_tag_audit', $defaultTag);
@@ -29,7 +34,7 @@ public function __construct(ILogFactory $logFactory, IConfig $config) {
if ($auditType === 'file' && !$logFile) {
$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
// Legacy way was appconfig, now it's paralleled with the normal log config
- $logFile = $config->getAppValue('admin_audit', 'logfile', $default);
+ $logFile = $appConfig->getAppValueString('logfile', $default);
}
$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
diff --git a/apps/admin_audit/lib/BackgroundJobs/Rotate.php b/apps/admin_audit/lib/BackgroundJobs/Rotate.php
index deb0f4a922c30..5a9ff2048a4fb 100644
--- a/apps/admin_audit/lib/BackgroundJobs/Rotate.php
+++ b/apps/admin_audit/lib/BackgroundJobs/Rotate.php
@@ -7,6 +7,7 @@
*/
namespace OCA\AdminAudit\BackgroundJobs;
+use OCP\AppFramework\Services\IAppConfig;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use OCP\IConfig;
@@ -17,6 +18,7 @@ class Rotate extends TimedJob {
public function __construct(
ITimeFactory $time,
+ private IAppConfig $appConfig,
private IConfig $config,
) {
parent::__construct($time);
@@ -26,7 +28,7 @@ public function __construct(
protected function run($argument): void {
$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
- $this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);
+ $this->filePath = $this->appConfig->getAppValueString('logfile', $default);
if ($this->filePath === '') {
// default log file, nothing to do
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index cbe08c0b2b458..93a832d24b611 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -20,16 +20,6 @@
-
-
-
-
-
-
-
-
-
-