Merge branch 'develop' into feature/os2web_key

Author: jekuaitk

CHANGELOG.md

@@ -13,12 +13,32 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 - [#101](https://github.com/OS2Forms/os2forms/pull/101)
   - Added support for `os2web_key` in Digital post
-  - Switched from saving settings in key value store to config, i.e
-    the module needs to be reconfigured.
+    - Switched from saving settings in key value store to config, i.e
+      the module needs to be reconfigured.
   - Added support for `os2web_key` in Fasit handler.
     - Switched from saving settings in key value store to config, i.e
       the module needs to be reconfigured.
 - Removed modules ldap_auth, logging_alerts, maillog
+- Updating the display of os2forms package on the status page
+
+## [4.0.0] 2025-03-06
+
+- This is an alias for for 3.22.2. Major change is the module removal, which can lead to lack of backward support.
+See full release note here:
+https://github.com/OS2Forms/os2forms_docs/blob/master/docs/releases/2024-Q4-Release-notes.md
+
+## [3.22.2] 2025-02-28
+
+- Updated `os2web_audit`.
+
+## [3.22.1] 2025-02-10
+
+- Updated `os2forms_fbs_handler` to include and correct set phone number [#161](https://github.com/OS2Forms/os2forms/pull/161)
+
+## [3.22.0] 2025-02-03
+
+- Removed modules ldap_auth, logging_alerts, maillog [#151](https://github.com/OS2Forms/os2forms/pull/151)
+- Removed module image_widget_crop [#OS-143](https://github.com/OS2Forms/os2forms/pull/159)
 
 ## [3.21.2] 2025-01-07
 
@@ -77,6 +97,13 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [3.16.0-beta1] 2024-08-27
 
+## [3.16.0] 2024-08-27
+
+f/OS-115_dawa_address
+- [OS-115] Skipping empty maktrikula objects
+
+
+
 [#110](https://github.com/OS2Forms/os2forms/pull/110)
 
 - Obsolete module removing - os2forms_consent
@@ -342,7 +369,10 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Security in case of vulnerabilities.
 ```
 
-[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.21.2...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.22.2...HEAD
+[3.22.2]: https://github.com/OS2Forms/os2forms/compare/3.22.1...3.22.2
+[3.22.1]: https://github.com/OS2Forms/os2forms/compare/3.22.0...3.22.1
+[3.22.0]: https://github.com/OS2Forms/os2forms/compare/3.21.2...3.22.0
 [3.21.2]: https://github.com/OS2Forms/os2forms/compare/3.21.1...3.21.2
 [3.21.1]: https://github.com/OS2Forms/os2forms/compare/3.21.0...3.21.1
 [3.21.0]: https://github.com/OS2Forms/os2forms/compare/3.20.1...3.21.0

composer.json

@@ -22,7 +22,6 @@
         "drupal/events_logging": "^2.0@beta",
         "drupal/gin": "^3.0-rc",
         "drupal/honeypot": "^2.0",
-        "drupal/image_widget_crop": "^2.3",
         "drupal/ldap": "^4.2",
         "drupal/leaflet": "^10.0",
         "drupal/leaflet_layers": "^1.1",
@@ -58,7 +57,7 @@
         "itk-dev/beskedfordeler-drupal": "^1.0",
         "itk-dev/serviceplatformen": "^1.5",
         "mglaman/composer-drupal-lenient": "^1.0",
-        "os2web/os2web_audit": "^0.1.6",
+        "os2web/os2web_audit": "^1.0",
         "os2web/os2web_datalookup": "^2.0",
         "os2web/os2web_key": "^1.0",
         "os2web/os2web_nemlogin": "^1.0",

modules/os2forms_dawa/src/Plugin/os2web/DataLookup/DatafordelerDataLookup.php

@@ -104,7 +104,12 @@ public function getMatrikulaEntries(string $matrikulaId) : array {
       if (NestedArray::keyExists($jsonDecoded, ['features', 0, 'properties', 'jordstykke'])) {
         $jordstykker = NestedArray::getValue($jsonDecoded, ['features', 0, 'properties', 'jordstykke']);
         foreach ($jordstykker as $jordstyk) {
-          $matrikulaEntries[] = new DatafordelerMatrikula($jordstyk);
+          try {
+            $matrikulaEntries[] = new DatafordelerMatrikula($jordstyk);
+          }
+          catch (\TypeError $e) {
+            // Could not create matrikula object.
+          }
         }
       }
     }

modules/os2forms_fbs_handler/src/Client/FBS.php renamed to modules/os2forms_fbs_handler/src/Client/Fbs.php

@@ -11,7 +11,7 @@
 /**
  * Minimalistic client to create user with guardians at FBS.
  */
-class FBS {
+class Fbs {
 
   /**
    * FBS session key.
@@ -118,8 +118,14 @@ public function createPatronWithGuardian(Patron $patron, Guardian $guardian) {
       'pincode' => $patron->pincode,
       'preferredPickupBranch' => $patron->preferredPickupBranch,
       'name' => 'Unknown Name',
-      'emailAddresses' => $patron->emailAddresses,
+      'emailAddresses' => $patron->emailAddresses ?? [],
       'guardian' => $guardian->toArray(),
+      'phoneNumbers' => $patron->phoneNumber ? [
+        [
+          'receiveNotification' => TRUE,
+          'phoneNumber' => $patron->phoneNumber,
+        ],
+      ] : [],
     ];
 
     return $this->request($uri, $payload);
@@ -148,12 +154,13 @@ public function getPatron(string $patronId): ?Patron {
         (bool) $json->patron->receiveSms,
         (bool) $json->patron->receivePostalMail,
         $json->patron->notificationProtocols,
-        $json->patron->phoneNumber,
         is_null($json->patron->onHold) ? $json->patron->onHold : (array) $json->patron->onHold,
         $json->patron->preferredLanguage,
         (bool) $json->patron->guardianVisibility,
         $json->patron->defaultInterestPeriod,
         (bool) $json->patron->resident,
+        $json->patron->phoneNumber,
+
         [
           [
             'emailAddress' => $json->patron->emailAddress,
@@ -185,15 +192,15 @@ public function updatePatron(Patron $patron): bool {
     $payload = [
       'patron' => [
         'preferredPickupBranch' => $patron->preferredPickupBranch,
-        'emailAddresses' => $patron->emailAddresses,
+        'emailAddresses' => $patron->emailAddresses ?? [],
         'guardianVisibility' => $patron->guardianVisibility,
         'receivePostalMail' => $patron->receiveEmail,
-        'phoneNumbers' => [
+        'phoneNumbers' => $patron->phoneNumber ? [
           [
             'receiveNotification' => TRUE,
             'phoneNumber' => $patron->phoneNumber,
           ],
-        ],
+        ] : [],
       ],
       'pincodeChange' => [
         'pincode' => $patron->pincode,

modules/os2forms_fbs_handler/src/Client/Model/Patron.php

@@ -19,13 +19,13 @@ public function __construct(
     public readonly ?bool $receiveSms = FALSE,
     public readonly ?bool $receivePostalMail = FALSE,
     public readonly ?array $notificationProtocols = NULL,
-    public readonly ?string $phoneNumber = NULL,
     public readonly ?array $onHold = NULL,
     public readonly ?string $preferredLanguage = NULL,
     public readonly ?bool $guardianVisibility = NULL,
     public readonly ?int $defaultInterestPeriod = NULL,
     public readonly ?bool $resident = NULL,
     // Allow these properties below to be updatable.
+    public ?string $phoneNumber = NULL,
     public ?array $emailAddresses = NULL,
     public ?bool $receiveEmail = NULL,
     public ?string $preferredPickupBranch = NULL,

modules/os2forms_fbs_handler/src/Plugin/AdvancedQueue/JobType/FbsCreateUser.php

@@ -8,7 +8,7 @@
 use Drupal\advancedqueue\Job;
 use Drupal\advancedqueue\JobResult;
 use Drupal\advancedqueue\Plugin\AdvancedQueue\JobType\JobTypeBase;
-use Drupal\os2forms_fbs_handler\Client\FBS;
+use Drupal\os2forms_fbs_handler\Client\Fbs;
 use Drupal\os2forms_fbs_handler\Client\Model\Guardian;
 use Drupal\os2forms_fbs_handler\Client\Model\Patron;
 use Drupal\os2web_audit\Service\Logger;
@@ -84,7 +84,7 @@ public function process(Job $job): JobResult {
       $config = $payload['configuration'];
 
       try {
-        $fbs = new FBS($this->client, $config['endpoint_url'], $config['agency_id'], $config['username'], $config['password']);
+        $fbs = new Fbs($this->client, $config['endpoint_url'], $config['agency_id'], $config['username'], $config['password']);
 
         // Log into FBS and obtain session.
         $fbs->login();
@@ -110,12 +110,17 @@ public function process(Job $job): JobResult {
           if (!is_null($patron)) {
             // Create Patron object with updated values.
             $patron->preferredPickupBranch = $data['afhentningssted'];
-            $patron->emailAddresses = [
-              [
-                'emailAddress' => $data['barn_mail'],
-                'receiveNotification' => TRUE,
-              ],
-            ];
+            if (!empty($data['barn_mail'])) {
+              $patron->emailAddresses = [
+                [
+                  'emailAddress' => $data['barn_mail'],
+                  'receiveNotification' => TRUE,
+                ],
+              ];
+            }
+            if (!empty($data['barn_tlf'])) {
+              $patron->phoneNumber = $data['barn_tlf'];
+            }
             $patron->receiveEmail = TRUE;
             $patron->pincode = $data['pinkode'];
 
@@ -127,15 +132,20 @@ public function process(Job $job): JobResult {
           // If "no" create child patron and guardian.
           $patron = new Patron();
           $patron->preferredPickupBranch = $data['afhentningssted'];
-          $patron->emailAddresses = [
-            [
-              'emailAddress' => $data['barn_mail'],
-              'receiveNotification' => TRUE,
-            ],
-          ];
+          if (!empty($data['barn_mail'])) {
+            $patron->emailAddresses = [
+              [
+                'emailAddress' => $data['barn_mail'],
+                'receiveNotification' => TRUE,
+              ],
+            ];
+          }
           $patron->receiveEmail = TRUE;
           $patron->personId = $data['barn_cpr'];
           $patron->pincode = $data['pinkode'];
+          if (!empty($data['barn_tlf'])) {
+            $patron->phoneNumber = $data['barn_tlf'];
+          }
 
           $fbs->createPatronWithGuardian($patron, $guardian);
         }

modules/os2forms_fbs_handler/src/Plugin/WebformHandler/FbsWebformHandler.php

@@ -183,6 +183,7 @@ public function postSave(WebformSubmissionInterface $webform_submission, $update
       'afhentningssted',
       'barn_cpr',
       'barn_mail',
+      'barn_tlf',
       'cpr',
       'email',
       'navn',

os2forms.install

@@ -5,6 +5,7 @@
  * Install file for OS2Forms module.
  */
 
+use Composer\InstalledVersions;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\taxonomy\Entity\Term;
@@ -63,21 +64,17 @@ function os2forms_requirements($phase) {
     'value' => $messages,
   ];
 
-  $commit_sha = exec('git rev-parse HEAD');
-  $tag = exec("git describe --tags --abbrev=0");
-  $remote = exec('git config --get remote.origin.url');
+  $reference = InstalledVersions::getReference("os2forms/os2forms");
+  $version = InstalledVersions::getPrettyVersion("os2forms/os2forms");
 
   $version_messages = [
     '#prefix' => t('OS2Forms version'),
     '#theme' => 'item_list',
     '#items' => [
-      0 => t('tag <strong>@tag</strong> (commit: <strong>@commit</strong>)', [
-        '@tag' => $tag,
-        '@commit' => $commit_sha,
-      ]),
-      1 => t('remote: <strong>@remote</strong>', [
-        '@remote' => $remote,
-      ]),
+      0 => t('version <strong>@version</strong> (commit: <strong>@reference</strong>)', [
+        '@version' => $version,
+        '@reference' => $reference,
+      ])
     ],
   ];