From 4a88b1659058e411825c61b1a9b55c264bb4e34f Mon Sep 17 00:00:00 2001
From: jekuaitk <jekua@aarhus.dk>
Date: Fri, 1 May 2026 13:37:25 +0200
Subject: [PATCH 1/3] Added first, middle and last name webform elements

---
 CHANGELOG.md                                  |  1 +
 .../src/Element/NemidFirstName.php            | 64 +++++++++++++++++++
 .../src/Element/NemidLastName.php             | 64 +++++++++++++++++++
 .../src/Element/NemidMiddleName.php           | 64 +++++++++++++++++++
 .../Plugin/WebformElement/NemidFirstName.php  | 29 +++++++++
 .../Plugin/WebformElement/NemidLastName.php   | 29 +++++++++
 .../Plugin/WebformElement/NemidMiddleName.php | 29 +++++++++
 7 files changed, 280 insertions(+)
 create mode 100644 modules/os2forms_nemid/src/Element/NemidFirstName.php
 create mode 100644 modules/os2forms_nemid/src/Element/NemidLastName.php
 create mode 100644 modules/os2forms_nemid/src/Element/NemidMiddleName.php
 create mode 100644 modules/os2forms_nemid/src/Plugin/WebformElement/NemidFirstName.php
 create mode 100644 modules/os2forms_nemid/src/Plugin/WebformElement/NemidLastName.php
 create mode 100644 modules/os2forms_nemid/src/Plugin/WebformElement/NemidMiddleName.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff23991..47c891a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- Added NemID first name, middle name and last name webform elements.
 - [PR-322](https://github.com/OS2Forms/os2forms/pull/322)
   Update Digital Post handler error messages.
 - [PR-320](https://github.com/OS2Forms/os2forms/pull/320)
diff --git a/modules/os2forms_nemid/src/Element/NemidFirstName.php b/modules/os2forms_nemid/src/Element/NemidFirstName.php
new file mode 100644
index 0000000..22be114
--- /dev/null
+++ b/modules/os2forms_nemid/src/Element/NemidFirstName.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Element;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a 'os2forms_nemid_first_name'.
+ *
+ * @FormElement("os2forms_nemid_first_name")
+ *
+ * @see \Drupal\Core\Render\Element\FormElement
+ * @see https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21FormElement.php/class/FormElement
+ * @see \Drupal\Core\Render\Element\RenderElement
+ * @see https://api.drupal.org/api/drupal/namespace/Drupal%21Core%21Render%21Element
+ * @see \Drupal\os2forms_nemid\Element\NemidFirstName
+ */
+class NemidFirstName extends NemidElementBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return parent::getInfo() + [
+      '#process' => [
+        [$class, 'processNemidFirstName'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateNemidFirstName'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderNemidFirstName'],
+      ],
+      '#theme' => 'input__os2forms_nemid_first_name',
+    ];
+  }
+
+  /**
+   * Processes a 'os2forms_nemid_first_name' element.
+   */
+  public static function processNemidFirstName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add and manipulate your element's properties and callbacks.
+    return $element;
+  }
+
+  /**
+   * Webform element validation handler for #type 'os2forms_nemid_first_name'.
+   */
+  public static function validateNemidFirstName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add custom validation logic.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preRenderNemidFirstName(array $element) {
+    $element = parent::prerenderNemidElementBase($element);
+    static::setAttributes($element, ['form-text', 'os2forms-nemid-first-name']);
+    return $element;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Element/NemidLastName.php b/modules/os2forms_nemid/src/Element/NemidLastName.php
new file mode 100644
index 0000000..251b114
--- /dev/null
+++ b/modules/os2forms_nemid/src/Element/NemidLastName.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Element;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a 'os2forms_nemid_last_name'.
+ *
+ * @FormElement("os2forms_nemid_last_name")
+ *
+ * @see \Drupal\Core\Render\Element\FormElement
+ * @see https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21FormElement.php/class/FormElement
+ * @see \Drupal\Core\Render\Element\RenderElement
+ * @see https://api.drupal.org/api/drupal/namespace/Drupal%21Core%21Render%21Element
+ * @see \Drupal\os2forms_nemid\Element\NemidLastName
+ */
+class NemidLastName extends NemidElementBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return parent::getInfo() + [
+      '#process' => [
+        [$class, 'processNemidLastName'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateNemidLastName'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderNemidLastName'],
+      ],
+      '#theme' => 'input__os2forms_nemid_last_name',
+    ];
+  }
+
+  /**
+   * Processes a 'os2forms_nemid_last_name' element.
+   */
+  public static function processNemidLastName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add and manipulate your element's properties and callbacks.
+    return $element;
+  }
+
+  /**
+   * Webform element validation handler for #type 'os2forms_nemid_last_name'.
+   */
+  public static function validateNemidLastName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add custom validation logic.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preRenderNemidLastName(array $element) {
+    $element = parent::prerenderNemidElementBase($element);
+    static::setAttributes($element, ['form-text', 'os2forms-nemid-last-name']);
+    return $element;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Element/NemidMiddleName.php b/modules/os2forms_nemid/src/Element/NemidMiddleName.php
new file mode 100644
index 0000000..48c038e
--- /dev/null
+++ b/modules/os2forms_nemid/src/Element/NemidMiddleName.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Element;
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Provides a 'os2forms_nemid_middle_name'.
+ *
+ * @FormElement("os2forms_nemid_middle_name")
+ *
+ * @see \Drupal\Core\Render\Element\FormElement
+ * @see https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Render%21Element%21FormElement.php/class/FormElement
+ * @see \Drupal\Core\Render\Element\RenderElement
+ * @see https://api.drupal.org/api/drupal/namespace/Drupal%21Core%21Render%21Element
+ * @see \Drupal\os2forms_nemid\Element\NemidMiddleName
+ */
+class NemidMiddleName extends NemidElementBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return parent::getInfo() + [
+      '#process' => [
+        [$class, 'processNemidMiddleName'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateNemidMiddleName'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderNemidMiddleName'],
+      ],
+      '#theme' => 'input__os2forms_nemid_middle_name',
+    ];
+  }
+
+  /**
+   * Processes a 'os2forms_nemid_middle_name' element.
+   */
+  public static function processNemidMiddleName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add and manipulate your element's properties and callbacks.
+    return $element;
+  }
+
+  /**
+   * Webform element validation handler for #type 'os2forms_nemid_middle_name'.
+   */
+  public static function validateNemidMiddleName(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Here you can add custom validation logic.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preRenderNemidMiddleName(array $element) {
+    $element = parent::prerenderNemidElementBase($element);
+    static::setAttributes($element, ['form-text', 'os2forms-nemid-middle-name']);
+    return $element;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidFirstName.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidFirstName.php
new file mode 100644
index 0000000..1f0b246
--- /dev/null
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidFirstName.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Plugin\WebformElement;
+
+use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
+
+/**
+ * Provides a 'os2forms_nemid_first_name' element.
+ *
+ * @WebformElement(
+ *   id = "os2forms_nemid_first_name",
+ *   label = @Translation("NemID First name"),
+ *   description = @Translation("Provides a NemID First name element."),
+ *   category = @Translation("NemID"),
+ * )
+ *
+ * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
+ * @see \Drupal\os2forms_nemid\Element\NemidFirstName
+ */
+class NemidFirstName extends ServiceplatformenCprElementBase implements NemidElementPersonalInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPrepopulateFieldFieldKey(array &$element) {
+    return CprLookupResult::FIRST_NAME;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidLastName.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidLastName.php
new file mode 100644
index 0000000..9c2bcca
--- /dev/null
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidLastName.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Plugin\WebformElement;
+
+use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
+
+/**
+ * Provides a 'os2forms_nemid_last_name' element.
+ *
+ * @WebformElement(
+ *   id = "os2forms_nemid_last_name",
+ *   label = @Translation("NemID Last name"),
+ *   description = @Translation("Provides a NemID Last name element."),
+ *   category = @Translation("NemID"),
+ * )
+ *
+ * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
+ * @see \Drupal\os2forms_nemid\Element\NemidLastName
+ */
+class NemidLastName extends ServiceplatformenCprElementBase implements NemidElementPersonalInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPrepopulateFieldFieldKey(array &$element) {
+    return CprLookupResult::LAST_NAME;
+  }
+
+}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidMiddleName.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidMiddleName.php
new file mode 100644
index 0000000..93a576e
--- /dev/null
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidMiddleName.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Plugin\WebformElement;
+
+use Drupal\os2web_datalookup\LookupResult\CprLookupResult;
+
+/**
+ * Provides a 'os2forms_nemid_middle_name' element.
+ *
+ * @WebformElement(
+ *   id = "os2forms_nemid_middle_name",
+ *   label = @Translation("NemID Middle name"),
+ *   description = @Translation("Provides a NemID Middle name element."),
+ *   category = @Translation("NemID"),
+ * )
+ *
+ * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
+ * @see \Drupal\os2forms_nemid\Element\NemidMiddleName
+ */
+class NemidMiddleName extends ServiceplatformenCprElementBase implements NemidElementPersonalInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPrepopulateFieldFieldKey(array &$element) {
+    return CprLookupResult::MIDDLE_NAME;
+  }
+
+}

From 15062f60d6fc04f692fbb1d089d20d91df7e3124 Mon Sep 17 00:00:00 2001
From: jekuaitk <jekua@aarhus.dk>
Date: Fri, 1 May 2026 13:46:12 +0200
Subject: [PATCH 2/3] Update CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47c891a..da4b1ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
-- Added NemID first name, middle name and last name webform elements.
+- [PR-325](https://github.com/OS2Forms/os2forms/pull/325)
+  Added NemID first name, middle name and last name webform elements.
 - [PR-322](https://github.com/OS2Forms/os2forms/pull/322)
   Update Digital Post handler error messages.
 - [PR-320](https://github.com/OS2Forms/os2forms/pull/320)

From 86108739700ee77ff10e53b50f1052a925a87c92 Mon Sep 17 00:00:00 2001
From: jekuaitk <jekua@aarhus.dk>
Date: Tue, 20 Oct 2026 14:24:51 +0200
Subject: [PATCH 3/3] Bumped os2web_datalookup version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ba5f18b..2045a0d 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
         "itk-dev/serviceplatformen": "^1.7.1",
         "mglaman/composer-drupal-lenient": "^1.0",
         "os2web/os2web_audit": "^1.0",
-        "os2web/os2web_datalookup": "^3.0",
+        "os2web/os2web_datalookup": "^3.5",
         "os2web/os2web_key": "^1.0",
         "os2web/os2web_nemlogin": "^1.0",
         "os2web/os2web_simplesaml": "dev-master",