Skip to content

fix: Fix settings import when a setting is typed #1026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
come-nc wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: Fix settings import when a setting is typed #1026

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
991427d
fix: Fix settings import when a setting is typed
come-nc Jan 29, 2026
7853636
chore: Add a psalm-suppress annotation to support old versions
come-nc Feb 2, 2026
088fac5
fix: Catch Exception about unknown keys
come-nc Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 53 additions & 3 deletions lib/Service/UserMigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\BackgroundJob\IJobList;
use OCP\Cache\CappedMemoryCache;
use OCP\Config\Exceptions\UnknownKeyException;
use OCP\Config\IUserConfig;
use OCP\Config\ValueType;
use OCP\Files\File;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
Expand Down Expand Up @@ -314,9 +317,56 @@ protected function importAppsSettings(IUser $user,
$output->writeln('Importing settings from settings.json…');

$data = json_decode($importSource->getFileContents('settings.json'), true, 512, JSON_THROW_ON_ERROR);
foreach ($data as $app => $values) {
foreach ($values as $key => $value) {
$this->config->setUserValue($user->getUID(), $app, $key, $value);

if (interface_exists(IUserConfig::class)) {
/*
* Starting with 32, we have to use the correct type
* When dropping support for <32, IUserConfig should be injected instead
*/
$userConfig = \OCP\Server::get(IUserConfig::class);
$userId = $user->getUID();
foreach ($data as $app => $values) {
foreach ($values as $key => $value) {
try {
$type = $userConfig->getValueType($userId, $app, $key);
} catch (UnknownKeyException) {
/** If type is unknown, default to mixed */
$type = ValueType::MIXED;
}
/** @psalm-suppress UndefinedClass ValueType only exists in 32 and higher, but in this if branch we know it exists */
switch ($type) {
default:
case ValueType::MIXED:
$this->config->setUserValue($userId, $app, $key, $value);
break;
case ValueType::STRING:
$userConfig->setValueString($userId, $app, $key, $value);
break;
case ValueType::INT:
$userConfig->setValueInt($userId, $app, $key, (int)$value);
break;
case ValueType::FLOAT:
$userConfig->setValueFloat($userId, $app, $key, (float)$value);
break;
case ValueType::BOOL:
if (is_string($value)) {
$value = in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
} elseif (!is_bool($value)) {
$value = (bool)$value;
}
$userConfig->setValueBool($userId, $app, $key, $value);
break;
case ValueType::ARRAY:
$userConfig->setValueArray($userId, $app, $key, $value);
break;
}
}
}
} else {
foreach ($data as $app => $values) {
foreach ($values as $key => $value) {
$this->config->setUserValue($user->getUID(), $app, $key, $value);
}
}
}
}
Expand Down