upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 06:08:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #46991 from nextcloud/fix/45083/config-from-js

Browse source 
fix(ProvisioningAPI): set typed config values by via API
This commit is contained in:
Arthur Schiwon 2024-08-21 14:58:24 +02:00 committed by GitHub
commit ebe2429c0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/provisioning_api/lib/Controller/AppConfigController.php
View file

@ -126,8 +126,17 @@ class AppConfigController extends OCSController {
return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
}
$configDetails = $this->appConfig->getDetails($app, $key);
/** @psalm-suppress InternalMethod */
$this->appConfig->setValueMixed($app, $key, $value);
match ($configDetails['type']) {
IAppConfig::VALUE_BOOL => $this->appConfig->setValueBool($app, $key, (bool)$value),
IAppConfig::VALUE_FLOAT => $this->appConfig->setValueFloat($app, $key, (float)$value),
IAppConfig::VALUE_INT => $this->appConfig->setValueInt($app, $key, (int)$value),
IAppConfig::VALUE_STRING => $this->appConfig->setValueString($app, $key, $value),
IAppConfig::VALUE_ARRAY => $this->appConfig->setValueArray($app, $key, \json_decode($value, true)),
default => $this->appConfig->setValueMixed($app, $key, $value),
};
return new DataResponse();
}

36
apps/provisioning_api/tests/Controller/AppConfigControllerTest.php
View file

@ -17,6 +17,8 @@ use OCP\IUser;
use OCP\IUserSession;
use OCP\Settings\IManager;
use Test\TestCase;
use function json_decode;
use function json_encode;
/**
* Class AppConfigControllerTest
@ -184,6 +186,12 @@ class AppConfigControllerTest extends TestCase {
['app1', 'key', 'default', new \InvalidArgumentException('error1'), null, Http::STATUS_FORBIDDEN],
['app2', 'key', 'default', null, new \InvalidArgumentException('error2'), Http::STATUS_FORBIDDEN],
['app2', 'key', 'default', null, null, Http::STATUS_OK],
['app2', 'key', '1', null, null, Http::STATUS_OK, IAppConfig::VALUE_BOOL],
['app2', 'key', '42', null, null, Http::STATUS_OK, IAppConfig::VALUE_INT],
['app2', 'key', '4.2', null, null, Http::STATUS_OK, IAppConfig::VALUE_FLOAT],
['app2', 'key', '42', null, null, Http::STATUS_OK, IAppConfig::VALUE_STRING],
['app2', 'key', 'secret', null, null, Http::STATUS_OK, IAppConfig::VALUE_STRING | IAppConfig::VALUE_SENSITIVE],
['app2', 'key', json_encode([4, 2]), null, null, Http::STATUS_OK, IAppConfig::VALUE_ARRAY],
];
}
@ -196,7 +204,7 @@ class AppConfigControllerTest extends TestCase {
* @param \Exception|null $keyThrows
* @param int $status
*/
public function testSetValue($app, $key, $value, $appThrows, $keyThrows, $status) {
public function testSetValue($app, $key, $value, $appThrows, $keyThrows, $status, int $type = IAppConfig::VALUE_MIXED) {
$adminUser = $this->createMock(IUser::class);
$adminUser->expects($this->once())
->method('getUid')
@ -240,8 +248,30 @@ class AppConfigControllerTest extends TestCase {
->with($app, $key);
$this->appConfig->expects($this->once())
->method('setValueMixed')
->with($app, $key, $value);
->method('getDetails')
->with($app, $key)
->willReturn([
'app' => $app,
'key' => $key,
'value' => '', // 🤷
'type' => $type,
'lazy' => false,
'typeString' => (string)$type, // this is not accurate, but acceptable
'sensitive' => ($type & IAppConfig::VALUE_SENSITIVE) !== 0,
]);
$configValueSetter = match ($type) {
IAppConfig::VALUE_BOOL => 'setValueBool',
IAppConfig::VALUE_FLOAT => 'setValueFloat',
IAppConfig::VALUE_INT => 'setValueInt',
IAppConfig::VALUE_STRING => 'setValueString',
IAppConfig::VALUE_ARRAY => 'setValueArray',
default => 'setValueMixed',
};
$this->appConfig->expects($this->once())
->method($configValueSetter)
->with($app, $key, $configValueSetter === 'setValueArray' ? json_decode($value, true) : $value);
}
$result = $api->setValue($app, $key, $value);