(refactor): retrieve bsn by DigiD session instead of value of form field

Author: Mike van den Hoek

src/PrefillGravityForms/Controllers/BaseController.php

@@ -2,8 +2,9 @@
 
 namespace OWC\PrefillGravityForms\Controllers;
 
+use Exception;
+use function OWC\PrefillGravityForms\Foundation\Helpers\decrypt;
 use function OWC\PrefillGravityForms\Foundation\Helpers\view;
-use function Yard\DigiD\Foundation\Helpers\decrypt;
 use function Yard\DigiD\Foundation\Helpers\resolve;
 use OWC\PrefillGravityForms\Foundation\TeamsLogger;
 use OWC\PrefillGravityForms\GravityForms\GravityFormsSettings;
@@ -33,31 +34,15 @@ public function resolveTeams(): TeamsLogger
         }
     }
 
-    /**
-     * Validate if form has a DigiD field.
-     * If so return the decrypted BSN number.
-     */
-    protected function getBSN(array $form): string
+    protected function getBSN(): string
     {
-        $bsn = '';
-
-        foreach ($form['fields'] as $field) {
-            if ($field->type !== 'digid') {
-                continue;
-            }
-
-            $resolvedBSN = resolve('session')->getSegment('digid')->get('bsn');
-
-            if (empty($resolvedBSN)) {
-                continue;
-            }
-
-            $bsn = decrypt($resolvedBSN);
-
-            break;
+        try {
+            $bsn = resolve('session')->getSegment('digid')->get('bsn');
+        } catch(Exception $e) {
+            $bsn = '';
         }
 
-        return $bsn;
+        return is_string($bsn) && ! empty($bsn) ? decrypt($bsn) : '';
     }
 
     /**

src/PrefillGravityForms/Controllers/EnableUController.php

@@ -6,7 +6,7 @@ class EnableUController extends BaseController
 {
     public function handle(array $form)
     {
-        $bsn = $this->getBSN($form);
+        $bsn = $this->getBSN();
 
         if (empty($bsn)) {
             return $form;

src/PrefillGravityForms/Controllers/OpenZaakController.php

@@ -6,7 +6,7 @@ class OpenZaakController extends BaseController
 {
     public function handle(array $form)
     {
-        $bsn = $this->getBSN($form);
+        $bsn = $this->getBSN();
 
         if (empty($bsn)) {
             return $form;

src/PrefillGravityForms/Foundation/Cryptor.php

@@ -4,16 +4,10 @@
 
 class Cryptor
 {
-    /** @var string */
-    protected $method = 'aes-128-ctr'; // default cipher method if none supplied
+    protected string $method = 'aes-128-ctr'; // default cipher method if none supplied
+    private string $key;
 
-    /** @var string */
-    private $key;
-
-    /**
-     * @param boolean $method
-     */
-    public function __construct($method = false)
+    public function __construct(bool $method = false)
     {
         $key = \AUTH_KEY ?? php_uname();
         if (ctype_print($key)) {

src/PrefillGravityForms/Foundation/Helpers.php

@@ -52,13 +52,7 @@ function decrypt($string): string
     return $decrypted ?: '';
 }
 
-/**
- * @param string $setting
- * @param string $default
- *
- * @return string
- */
-function config(string $setting, $default = ''): ?string
+function config(string $setting, $default = '')
 {
     return resolve('config')->get($setting, $default);
 }