From 936c51453a0c7e6d2a96e42f9784ac1bab1baba2 Mon Sep 17 00:00:00 2001 From: Maarten Bruna <14947039+ictbeheer@users.noreply.github.com> Date: Thu, 26 Jun 2025 15:18:39 +0200 Subject: [PATCH 1/3] (chore): update Signicat and add Gravity Forms Encryption --- composer.json | 3 ++- composer.lock | 34 +++++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index e46c0081..fb07e456 100644 --- a/composer.json +++ b/composer.json @@ -143,7 +143,7 @@ "plugin/owc-gravityforms-zaaksysteem": "^2.3.3", "plugin/owc-gravityforms-zaaksysteem-enable-u": "^2.4.1", "plugin/owc-shared-aura-session-instance": "^1.0.0", - "plugin/owc-signicat-openid": "1.0.*", + "plugin/owc-signicat-openid": "dev-fix/redirect-url", "plugin/prefill-gravity-forms": "^1.7", "privacybydesign/irma-wp": "@dev", "vlucas/phpdotenv": "^5.0", @@ -168,6 +168,7 @@ "ypackagist/gp-preview-submission": "^1.3.15", "ypackagist/gravity-forms-power-automate": "^1.5.1", "ypackagist/gravityforms": "^2.8", + "ypackagist/gravityforms-encryption": "^1.6", "ypackagist/gravityformssurvey": "^3.8", "ypackagist/gravityformswebhooks": "^1.5", "ypackagist/gravityformszapier": "^4.2.1", diff --git a/composer.lock b/composer.lock index 64e35aea..79b17b37 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d798c6845e202b2af403f9f628f01674", + "content-hash": "1bb94eccd5f5b3e4b10c827189445aa0", "packages": [ { "name": "aura/session", @@ -3595,16 +3595,16 @@ }, { "name": "plugin/owc-signicat-openid", - "version": "v1.0.0", + "version": "dev-fix/redirect-url", "source": { "type": "git", "url": "git@github.com:yardinternet/plugin-owc-signicat-openid.git", - "reference": "d5f429c91d7a81e06a06589085953f48e7d71910" + "reference": "4e63768a01326db94d9ec21f15affc018c312f97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yardinternet/plugin-owc-signicat-openid/zipball/d5f429c91d7a81e06a06589085953f48e7d71910", - "reference": "d5f429c91d7a81e06a06589085953f48e7d71910", + "url": "https://api.github.com/repos/yardinternet/plugin-owc-signicat-openid/zipball/4e63768a01326db94d9ec21f15affc018c312f97", + "reference": "4e63768a01326db94d9ec21f15affc018c312f97", "shasum": "" }, "require": { @@ -3653,10 +3653,10 @@ ], "description": "Log into the Signicat Broker with OpenID", "support": { - "source": "https://github.com/yardinternet/plugin-owc-signicat-openid/tree/v1.0.0", + "source": "https://github.com/yardinternet/plugin-owc-signicat-openid/tree/fix/redirect-url", "issues": "https://github.com/yardinternet/plugin-owc-signicat-openid/issues" }, - "time": "2025-01-29T13:53:35+00:00" + "time": "2025-06-27T07:03:49+00:00" }, { "name": "plugin/prefill-gravity-forms", @@ -6629,6 +6629,25 @@ "description": "Easily create web forms and manage form entries within the WordPress admin.", "homepage": "https://gravityforms.com" }, + { + "name": "ypackagist/gravityforms-encryption", + "version": "1.6.0", + "dist": { + "type": "zip", + "url": "https://packagist.yard.nl/satispress/gravityforms-encryption/1.6.0", + "shasum": "6524f626a5315b0a0460ec2dc4a23d23526fbffd" + }, + "require": { + "composer/installers": "^1.0 || ^2.0" + }, + "type": "wordpress-plugin", + "authors": { + "name": "CrossPeak Software", + "homepage": "https://www.crosspeaksoftware.com/" + }, + "description": "Adds an option to the Gravity Forms text fields to allow the values to be encrypted in the database.", + "homepage": "https://www.crosspeaksoftware.com/downloads/gravity-forms-encryption/" + }, { "name": "ypackagist/gravityformssurvey", "version": "3.8", @@ -11073,6 +11092,7 @@ "stability-flags": { "deployer/recipes": 20, "plugin/formio-wordpress": 20, + "plugin/owc-signicat-openid": 20, "privacybydesign/irma-wp": 20 }, "prefer-stable": false, From 46ff4c764c2e0fef5b9e93175741849d7f83bb59 Mon Sep 17 00:00:00 2001 From: Maarten Bruna <14947039+ictbeheer@users.noreply.github.com> Date: Fri, 27 Jun 2025 09:31:36 +0200 Subject: [PATCH 2/3] (feat): set encryption key --- .env.example | 2 ++ app/GravityForms/GravityForms.php | 1 + 2 files changed, 3 insertions(+) diff --git a/.env.example b/.env.example index 88b14038..1457a1f0 100644 --- a/.env.example +++ b/.env.example @@ -38,3 +38,5 @@ MS_TEAMS_DISABLE_LOGGING=true OPEN_ZAAK_URL= OPEN_ZAAK_CLIENT_ID= OPEN_ZAAK_CLIENT_SECRET= + +CROSSPEAK_GRAVITYFORMS_ENCRYPTION_KEY= diff --git a/app/GravityForms/GravityForms.php b/app/GravityForms/GravityForms.php index 4a04fbe5..945a80ae 100644 --- a/app/GravityForms/GravityForms.php +++ b/app/GravityForms/GravityForms.php @@ -18,6 +18,7 @@ public function register(): void add_filter('pre_option_rg_gforms_enable_html5', '__return_true'); add_filter('gform_field_validation', [$this, 'changeRequiredFieldMessage'], 10, 4); add_filter('gform_field_validation', [$this, 'validateFieldIBAN'], 10, 4); + define('CROSSPEAK_GRAVITYFORMS_ENCRYPTION_KEY', env('CROSSPEAK_GRAVITYFORMS_ENCRYPTION_KEY', '')); } /** From c351deb9c1971e1ec823fda587d5af79510b239b Mon Sep 17 00:00:00 2001 From: Maarten Bruna <14947039+ictbeheer@users.noreply.github.com> Date: Mon, 30 Jun 2025 14:40:18 +0200 Subject: [PATCH 3/3] (fix): don't encrypt merge tags --- app/GravityForms/GravityForms.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/GravityForms/GravityForms.php b/app/GravityForms/GravityForms.php index 945a80ae..c7ce783f 100644 --- a/app/GravityForms/GravityForms.php +++ b/app/GravityForms/GravityForms.php @@ -19,6 +19,9 @@ public function register(): void add_filter('gform_field_validation', [$this, 'changeRequiredFieldMessage'], 10, 4); add_filter('gform_field_validation', [$this, 'validateFieldIBAN'], 10, 4); define('CROSSPEAK_GRAVITYFORMS_ENCRYPTION_KEY', env('CROSSPEAK_GRAVITYFORMS_ENCRYPTION_KEY', '')); + + // Remove the encryption filter for merge tags so the data can be used in emails. + remove_filter('gform_merge_tag_filter', 'gf_encryption_gform_merge_tag_filter', 10, 4); } /**