fix(config): Make sure user keys are strings

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
index 36f5f2cd40a0ac3fbe7b3733c76b6df780c18c1e..1a3d032a61edbb9791370fad6408e2474d50a335 100644 (file)
--- a/lib/private/AllConfig.php
+++ b/lib/private/AllConfig.php
@@ -334,7 +334,7 @@ class AllConfig implements \OCP\IConfig {
        public function getUserKeys($userId, $appName) {
                $data = $this->getUserValues($userId);
                if (isset($data[$appName])) {
-                       return array_keys($data[$appName]);
+                       return array_map('strval', array_keys($data[$appName]));
                } else {
                        return [];
                }

diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php
index 9daa7c9be9c8a1aaf7cb8d5a901e795ab344afc4..71def607ac7ab403c8dc2668a948f30b8101aaf9 100644 (file)
--- a/tests/lib/AllConfigTest.php
+++ b/tests/lib/AllConfigTest.php
@@ -276,6 +276,31 @@ class AllConfigTest extends \Test\TestCase {
                $this->connection->executeUpdate('DELETE FROM `*PREFIX*preferences`');
        }
 
+       public function testGetUserKeysAllInts() {
+               $config = $this->getConfig();
+
+               // preparation - add something to the database
+               $data = [
+                       ['userFetch', 'appFetch1', '123', 'value'],
+                       ['userFetch', 'appFetch1', '456', 'value'],
+               ];
+               foreach ($data as $entry) {
+                       $this->connection->executeUpdate(
+                               'INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, ' .
+                               '`configkey`, `configvalue`) VALUES (?, ?, ?, ?)',
+                               $entry
+                       );
+               }
+
+               $value = $config->getUserKeys('userFetch', 'appFetch1');
+               $this->assertEquals(['123', '456'], $value);
+               $this->assertIsString($value[0]);
+               $this->assertIsString($value[1]);
+
+               // cleanup
+               $this->connection->executeUpdate('DELETE FROM `*PREFIX*preferences`');
+       }
+
        public function testGetUserValueDefault() {
                $config = $this->getConfig();