Merge pull request #49386 from nextcloud/bugfix/47658/dont-fail-precondition-if-unset

nickvergessen · web-flow · commit 9b11c4202f47 · 2024-11-19T19:05:35.000+01:00
fix(userconfig): Don't fail the precondition if the value is not set at all
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
@@ -246,7 +246,7 @@ public function setUserValue($userId, $appName, $key, $value, $preCondition = nu
 		$userPreferences = \OCP\Server::get(IUserConfig::class);
 		if ($preCondition !== null) {
 			try {
-				if ($userPreferences->getValueMixed($userId, $appName, $key) !== (string)$preCondition) {
+				if ($userPreferences->hasKey($userId, $appName, $key) && $userPreferences->getValueMixed($userId, $appName, $key) !== (string)$preCondition) {
 					throw new PreConditionNotMetException();
 				}
 			} catch (TypeConflictException) {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public function setUserValue($userId, $appName, $key, $value, $preCondition = nu`
`246`	`246`	`$userPreferences = \OCP\Server::get(IUserConfig::class);`
`247`	`247`	`if ($preCondition !== null) {`
`248`	`248`	`try {`
`249`		`- if ($userPreferences->getValueMixed($userId, $appName, $key) !== (string)$preCondition) {`
	`249`	`+ if ($userPreferences->hasKey($userId, $appName, $key) && $userPreferences->getValueMixed($userId, $appName, $key) !== (string)$preCondition) {`
`250`	`250`	`throw new PreConditionNotMetException();`
`251`	`251`	`}`
`252`	`252`	`} catch (TypeConflictException) {`