itk-dev · martinyde · May 12, 2026 · May 12, 2026 · May 12, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+- [PR-392](https://github.com/itk-dev/os2loop/pull/392)
+  - Update admin forms to match d11
+  - Update OIDC container
+
 - [PR-391](https://github.com/itk-dev/os2loop/pull/391)
   Mail development setup
 

diff --git a/docker-compose.oidc.yml b/docker-compose.oidc.yml
@@ -1,16 +1,21 @@
 services:
   idp-employee:
     image: ghcr.io/geigerzaehler/oidc-provider-mock:latest
+    # Let this container be accessible both internally and externally on the same domain.
+    container_name: idp-employee.${COMPOSE_DOMAIN}
     networks:
       - app
       - frontend
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=frontend"
       - "traefik.http.routers.idp-employee_${COMPOSE_PROJECT_NAME:?}.rule=Host(`idp-employee.${COMPOSE_DOMAIN:?}`)"
-      - "traefik.http.services.idp-employee_${COMPOSE_PROJECT_NAME:?}.loadbalancer.server.port=9400"
+    expose:
+      - "80"
     command:
       [
+        "--port",
+        "80",
         "--user-claims",
         '{"sub": "user", "email": "user@example.com", "groups": ["authenticated"]}',
         "--user-claims",

diff --git a/web/profiles/custom/os2loop/modules/os2loop_alert/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_alert/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_alert\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -40,8 +41,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -51,6 +52,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_analytics/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_analytics/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_analytics\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\os2loop_settings\Settings;
@@ -30,8 +31,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -41,6 +42,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_cookies/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_cookies/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_cookies\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\os2loop_settings\Settings;
@@ -30,8 +31,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -41,6 +42,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_documents/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_documents/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_documents\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
@@ -41,8 +42,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings, EntityTypeManagerInterface $entityTypeManager) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings, EntityTypeManagerInterface $entityTypeManager) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
     $this->fileStorage = $entityTypeManager->getStorage('file');
   }
@@ -53,6 +54,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class),
       $container->get('entity_type.manager')
     );

diff --git a/web/profiles/custom/os2loop/modules/os2loop_flag_content/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_flag_content/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_flag_content\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\node\Entity\NodeType;
@@ -31,8 +32,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -42,6 +43,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_mail_notifications\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -40,8 +41,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings, EntityFieldManagerInterface $entityFieldManager) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings, EntityFieldManagerInterface $entityFieldManager) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
     $this->entityFieldManager = $entityFieldManager;
   }
@@ -52,6 +53,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class),
       $container->get('entity_field.manager')
     );

diff --git a/web/profiles/custom/os2loop/modules/os2loop_member_list/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_member_list/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_member_list\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -32,8 +33,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -43,6 +44,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_post/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_post/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_post\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -32,8 +33,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -43,6 +44,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_question/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_question/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_question\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -32,8 +33,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -43,6 +44,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_search_db/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_search_db/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_search_db\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -33,8 +34,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -44,6 +45,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_settings/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_settings/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_settings\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
@@ -49,8 +50,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings, PathValidatorInterface $pathValidator) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings, PathValidatorInterface $pathValidator) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
     $this->pathValidator = $pathValidator;
   }
@@ -61,6 +62,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class),
       $container->get('path.validator')
     );

diff --git a/web/profiles/custom/os2loop/modules/os2loop_share_with_a_friend/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_share_with_a_friend/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_share_with_a_friend\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -33,8 +34,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -44,6 +45,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }

diff --git a/web/profiles/custom/os2loop/modules/os2loop_subscriptions/src/Form/SettingsForm.php b/web/profiles/custom/os2loop/modules/os2loop_subscriptions/src/Form/SettingsForm.php
@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_subscriptions\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -33,8 +34,8 @@ final class SettingsForm extends ConfigFormBase {
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
-    parent::__construct($config_factory);
+  public function __construct(ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typedConfigManager, Settings $settings) {
+    parent::__construct($config_factory, $typedConfigManager);
     $this->settings = $settings;
   }
 
@@ -44,6 +45,7 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
+      $container->get('config.typed'),
       $container->get(Settings::class)
     );
   }