Merge pull request #8082 from nextcloud/fix/psalm-deprecation

fix: Move away from deprecated methods to set user config

Author: juliusknorr

lib/Controller/SettingsController.php

@@ -12,7 +12,7 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\IConfig;
+use OCP\Config\IUserConfig;
 use OCP\IRequest;
 
 class SettingsController extends Controller {
@@ -24,7 +24,7 @@ class SettingsController extends Controller {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private IConfig $config,
+		private IUserConfig $userConfig,
 		private ?string $userId,
 	) {
 		parent::__construct($appName, $request);
@@ -40,8 +40,9 @@ public function updateConfig(string $key, int|string $value): DataResponse {
 		if (!in_array($key, self::ACCEPTED_KEYS, true)) {
 			return new DataResponse(['message' => 'Invalid config key'], Http::STATUS_BAD_REQUEST);
 		}
+
 		/** @psalm-suppress PossiblyNullArgument */
-		$this->config->setUserValue($this->userId, Application::APP_NAME, $key, (string)$value);
+		$this->userConfig->setValueBool($this->userId, Application::APP_NAME, $key, (string)($value) === '1');
 		return new DataResponse([
 			$key => $value
 		]);

lib/DAV/WorkspacePlugin.php

@@ -12,13 +12,11 @@
 use OC\Files\Node\File;
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Files\FilesHome;
-use OCA\Text\AppInfo\Application;
+use OCA\Text\Service\ConfigService;
 use OCA\Text\Service\WorkspaceService;
 use OCP\Files\GenericFileException;
-use OCP\Files\IRootFolder;
 use OCP\Files\NotPermittedException;
 use OCP\ICacheFactory;
-use OCP\IConfig;
 use OCP\Lock\LockedException;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\INode;
@@ -35,9 +33,8 @@ class WorkspacePlugin extends ServerPlugin {
 
 	public function __construct(
 		private WorkspaceService $workspaceService,
-		private IRootFolder $rootFolder,
 		private ICacheFactory $cacheFactory,
-		private IConfig $config,
+		private ConfigService $configService,
 		private LoggerInterface $logger,
 		private ?string $userId,
 	) {
@@ -71,8 +68,8 @@ public function propFind(PropFind $propFind, INode $node) {
 			return;
 		}
 
-		$workspaceAvailable = $this->config->getAppValue(Application::APP_NAME, 'workspace_available', '1') === '1';
-		$workspaceEnabled = $this->config->getUserValue($this->userId, Application::APP_NAME, 'workspace_enabled', '1') === '1';
+		$workspaceAvailable = $this->configService->isRichWorkspaceAvailable();
+		$workspaceEnabled = $this->configService->isRichWorkspaceEnabledForUser($this->userId);
 
 		if (!$workspaceAvailable || !$workspaceEnabled) {
 			return;

lib/Service/ConfigService.php

@@ -8,12 +8,14 @@
 namespace OCA\Text\Service;
 
 use OCA\Text\AppInfo\Application;
+use OCP\Config\IUserConfig;
 use OCP\IAppConfig;
 use OCP\IConfig;
 
 class ConfigService {
 	public function __construct(
 		private IAppConfig $appConfig,
+		private IUserConfig $userConfig,
 		private IConfig $config,
 	) {
 	}
@@ -41,7 +43,7 @@ public function isRichWorkspaceEnabledForUser(?string $userId): bool {
 		if ($userId === null) {
 			return true;
 		}
-		return $this->config->getUserValue($userId, Application::APP_NAME, 'workspace_enabled', '1') === '1';
+		return $this->userConfig->getValueBool($userId, Application::APP_NAME, 'workspace_enabled', true);
 	}
 
 	public function isNotifyPushSyncEnabled(): bool {
@@ -50,6 +52,9 @@ public function isNotifyPushSyncEnabled(): bool {
 	}
 
 	public function isFullWidthEditor(?string $userId): bool {
-		return $this->config->getUserValue($userId, Application::APP_NAME, 'is_full_width_editor', '0') === '1';
+		if ($userId === null) {
+			return false;
+		}
+		return $this->userConfig->getValueBool($userId, Application::APP_NAME, 'is_full_width_editor');
 	}
 }