User settings improvements

johncms · Feb 18, 2023 · 0e571c3 · 0e571c3
1 parent d112309
commit 0e571c3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/config/autoload/system.global.php b/config/autoload/system.global.php
@@ -11,7 +11,7 @@
 
         'meta_title'       => 'JohnCMS',
         'meta_keywords'    => 'johncms',
-        'meta_description' => 'Powered by JohnCMS http://johncms.com',
+        'meta_description' => 'Powered by JohnCMS https://johncms.com',
 
         'email'     => 'no-reply@example.com',
         'copyright' => 'JohnCMS',

diff --git a/modules/johncms/personal/src/Forms/SettingsForm.php b/modules/johncms/personal/src/Forms/SettingsForm.php
@@ -9,14 +9,16 @@
 use Johncms\Forms\Inputs\InputText;
 use Johncms\Forms\Inputs\Select;
 use Johncms\i18n\Languages;
+use Johncms\Settings\SiteSettings;
 use Johncms\Users\User;
 use Johncms\Utility\DateTime;
 use Johncms\View\Themes;
 
 class SettingsForm extends AbstractForm
 {
     public function __construct(
-        protected ?User $userData = null
+        protected SiteSettings $siteSettings,
+        protected ?User $userData = null,
     ) {
         parent::__construct();
     }
@@ -31,13 +33,13 @@ protected function prepareFormFields(): array
             ->setOptions($this->getLanguages())
             ->setLabel(__('Language'))
             ->setNameAndId('lang')
-            ->setValue($this->getValue('lang'));
+            ->setValue($this->getValue('lang', $this->siteSettings->getLanguage()));
 
         $fields['timezone'] = (new Select())
             ->setOptions($this->getTimezones())
             ->setLabel(__('Timezone'))
             ->setNameAndId('timezone')
-            ->setValue($this->getValue('timezone'));
+            ->setValue(parent::getValue('timezone', $this->siteSettings->getTimezone()));
 
         $fields['directUrl'] = (new Checkbox())
             ->setLabel(__('Direct links'))
@@ -50,7 +52,7 @@ protected function prepareFormFields(): array
             ->setLabel(__('Elements per page'))
             ->setPlaceholder(__('Elements per page'))
             ->setNameAndId('perPage')
-            ->setValue($this->getValue('perPage'));
+            ->setValue(parent::getValue('perPage', $this->siteSettings->getPerPage()));
 
         $fields['theme'] = (new Select())
             ->setOptions($this->getThemesList())
@@ -65,7 +67,9 @@ public function getValue(string $fieldName, mixed $default = null): mixed
     {
         if ($this->userData) {
             // Base fields
-            return parent::getValue($fieldName, $this->userData->settings?->$fieldName);
+            if ($this->userData->settings?->$fieldName !== null) {
+                return parent::getValue($fieldName, $this->userData->settings?->$fieldName);
+            }
         }
         return parent::getValue($fieldName, $default);
     }

diff --git a/system/src/ConfigProvider.php b/system/src/ConfigProvider.php
@@ -53,6 +53,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
 
 class ConfigProvider
@@ -81,10 +82,11 @@ private function getDependencies(): array
     {
         return [
             'aliases' => [
-                Request::class        => ServerRequestInterface::class,
-                RequestFactory::class => ServerRequestInterface::class,
-                Factory::class        => Render::class,
-                'view'                => Render::class,
+                Request::class             => ServerRequestInterface::class,
+                RequestFactory::class      => ServerRequestInterface::class,
+                Factory::class             => Render::class,
+                'view'                     => Render::class,
+                SerializerInterface::class => Serializer::class,
             ],
 
             'factories' => [
@@ -107,7 +109,7 @@ private function getDependencies(): array
                 ExceptionHandlers::class        => ExceptionHandlers::class,
                 RouterFactory::class            => RouterFactory::class,
                 Dispatcher::class               => DispatcherFactory::class,
-                SerializerInterface::class      => SerializerFactory::class,
+                Serializer::class               => SerializerFactory::class,
             ],
         ];
     }

diff --git a/system/src/Users/Casts/UserSettings.php b/system/src/Users/Casts/UserSettings.php
@@ -14,8 +14,9 @@
 
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Collection;
 use Johncms\Users\UserConfig;
+use JsonException;
+use Symfony\Component\Serializer\Serializer;
 
 class UserSettings implements CastsAttributes
 {
@@ -24,14 +25,18 @@ class UserSettings implements CastsAttributes
      *
      * @param Model $model
      * @param mixed $value
+     * @throws JsonException
      */
     public function get($model, string $key, $value, array $attributes): UserConfig
     {
         $settings = [];
         if (! empty($value)) {
             $settings = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
         }
-        return new UserConfig($settings);
+
+        $serializer = di(Serializer::class);
+
+        return $serializer->denormalize($settings, UserConfig::class);
     }
 
     /**
@@ -42,6 +47,7 @@ public function get($model, string $key, $value, array $attributes): UserConfig
      */
     public function set($model, string $key, $value, array $attributes): string
     {
-        return json_encode((new Collection($value))->toArray(), JSON_THROW_ON_ERROR);
+        $serializer = di(Serializer::class);
+        return $serializer->serialize($value, 'json');
     }
 }
diff --git a/system/src/Users/UserConfig.php b/system/src/Users/UserConfig.php
@@ -17,29 +17,16 @@ class UserConfig
     /** @var bool Allow direct external links */
     public bool $directUrl = false;
 
-    public int $perPage = 10;
+    public ?int $perPage = null;
 
-    public string $lang = 'en';
+    public ?string $lang = null;
 
-    public string $timezone = 'UTC';
+    public ?string $timezone = null;
 
     public ?string $theme = null;
 
-    public function __construct(array $settings = [])
+    public function __set($name, $value)
     {
-        foreach ($settings as $key => $value) {
-            $this->$key = $this->castValue(gettype($this->$key), $value);
-        }
-    }
-
-    private function castValue(string $type, mixed $value): float|bool|int|string
-    {
-        return match ($type) {
-            'int', 'integer' => (int) $value,
-            'float' => (float) $value,
-            'string' => (string) $value,
-            'bool', 'boolean' => (bool) $value,
-            default => $value,
-        };
+        $this->$name = $value;
     }
 }