feat(lexicon): configurable default value

Signed-off-by: Maxence Lange <[email protected]>

core/Command/Config/App/GetConfig.php

@@ -79,7 +79,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			if (!$input->hasParameterOption('--default-value')) {
 				return 1;
 			}
-			$configValue = $defaultValue;
+
+			// get the default value defined from lexicon
+			$configValue = $this->appConfig->getValueMixed($appName, $configName, $defaultValue ?? '');
 		}
 
 		$this->writeMixedInOutputFormat($input, $output, $configValue);

lib/private/AppFramework/Bootstrap/RegistrationContext.php

@@ -11,6 +11,7 @@
 
 use Closure;
 use NCU\Config\Lexicon\IConfigLexicon;
+use OC\Config\Lexicon\CoreConfigLexicon;
 use OC\Support\CrashReport\Registry;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
@@ -143,7 +144,7 @@ class RegistrationContext {
 	private array $declarativeSettings = [];
 
 	/** @var array<array-key, string> */
-	private array $configLexiconClasses = [];
+	private array $configLexiconClasses = ['core' => CoreConfigLexicon::class];
 
 	/** @var ServiceRegistration<ITeamResourceProvider>[] */
 	private array $teamResourceProviders = [];

lib/private/Config/Lexicon/CoreConfigLexicon.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+namespace OC\Config\Lexicon;
+
+use NCU\Config\Lexicon\ConfigLexiconEntry;
+use NCU\Config\Lexicon\ConfigLexiconStrictness;
+use NCU\Config\Lexicon\IConfigLexicon;
+use NCU\Config\ValueType;
+
+/**
+ * ConfigLexicon for 'core' app/user configs
+ *
+ * @since 31.0.0
+ */
+class CoreConfigLexicon implements IConfigLexicon {
+	/**
+	 * @inheritDoc
+	 * @return ConfigLexiconStrictness
+	 * @since 31.0.0
+	 */
+	public function getStrictness(): ConfigLexiconStrictness {
+		return ConfigLexiconStrictness::IGNORE;
+	}
+
+	/**
+	 * @inheritDoc
+	 * @return ConfigLexiconEntry[]
+	 * @since 31.0.0
+	 */
+	public function getAppConfigs(): array {
+		return [
+			new ConfigLexiconEntry('lastcron', ValueType::INT, 0, 'timestamp of last cron execution'),
+		];
+	}
+
+	/**
+	 * @inheritDoc
+	 * @return ConfigLexiconEntry[]
+	 * @since 31.0.0
+	 */
+	public function getUserConfigs(): array {
+		return [
+			new ConfigLexiconEntry('lang', ValueType::STRING, null, 'language'),
+		];
+	}
+}

lib/private/Config/UserConfig.php

@@ -71,6 +71,7 @@ class UserConfig implements IUserConfig {
 
 	public function __construct(
 		protected IDBConnection $connection,
+		protected IConfig $config,
 		protected LoggerInterface $logger,
 		protected ICrypto $crypto,
 	) {
@@ -1843,7 +1844,9 @@ private function matchAndApplyLexiconDefinition(
 		}
 
 		$lazy = $configValue->isLazy();
-		$default = $configValue->getDefault() ?? $default; // default from Lexicon got priority
+		// default from Lexicon got priority but it can still be overwritten by admin
+		// with 'lexicon.default.userconfig' => [<app>.<key> => 'my value'], in config.php
+		$default = $this->config->getSystemValue('lexicon.default.userconfig', [])[$app . '.' . $key] ?? $configValue->getDefault() ?? $default;
 		$flags = $configValue->getFlags();
 
 		if ($configValue->isDeprecated()) {

tests/lib/Config/UserConfigTest.php

@@ -12,6 +12,7 @@
 use NCU\Config\IUserConfig;
 use NCU\Config\ValueType;
 use OC\Config\UserConfig;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\Security\ICrypto;
 use Psr\Log\LoggerInterface;
@@ -26,6 +27,7 @@
  */
 class UserConfigTest extends TestCase {
 	protected IDBConnection $connection;
+	private IConfig $config;
 	private LoggerInterface $logger;
 	private ICrypto $crypto;
 	private array $originalPreferences;
@@ -169,6 +171,7 @@ protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OCP\Server::get(IDBConnection::class);
+		$this->config = \OCP\Server::get(IConfig::class);
 		$this->logger = \OCP\Server::get(LoggerInterface::class);
 		$this->crypto = \OCP\Server::get(ICrypto::class);
 
@@ -277,6 +280,7 @@ protected function tearDown(): void {
 	private function generateUserConfig(array $preLoading = []): IUserConfig {
 		$userConfig = new \OC\Config\UserConfig(
 			$this->connection,
+			$this->config,
 			$this->logger,
 			$this->crypto,
 		);