Merge branch 'master' into release

postcode-nl · Nov 18, 2021 · 8af1606 · 8af1606
2 parents 0d21990 + ee72d51
commit 8af1606
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/assets/js/postcode-eu-autofill.js b/assets/js/postcode-eu-autofill.js
@@ -254,7 +254,7 @@
 		{
 			const postcode = postcodeRegex.exec(postcodeField.val())[0].replace(/\s/g, ''),
 				houseNumber = houseNumberRegex.exec(houseNumberField.val())[0].trim(),
-				url = settings.dutchAddressLookup + postcode + '/' + houseNumber;
+				url = settings.dutchAddressLookup + postcode + '/' + encodeURIComponent(encodeURIComponent(houseNumber));
 
 			resetHouseNumberSelect();
 			resetAddressFields(addressFields);
@@ -396,6 +396,13 @@
 				context: (countryIsoMap.get(countryToState.val()) || 'nld').toLowerCase(),
 			});
 
+			const getSuggestions = autocompleteInstance.getSuggestions;
+
+			autocompleteInstance.getSuggestions = function () {
+				arguments[1] = encodeURIComponent(arguments[1]); // Term needs double encoding because of autodecoding of superglobals.
+				getSuggestions.apply(this, arguments);
+			}
+
 			intlField[0].addEventListener('autocomplete-select', function (e) {
 				if (e.detail.precision === 'Address')
 				{

diff --git a/postcodenl-address-autocomplete.php b/postcodenl-address-autocomplete.php
@@ -3,7 +3,7 @@
  * Plugin Name: Postcode.nl Address Autocomplete
  * Plugin URI: https://www.postcode.nl/en/services/adresdata/implementatie
  * Description: Reference implementation for Postcode.nl international address autocomplete for WooCommerce
- * Version: 2.0.1
+ * Version: 2.0.2
  * Author: Postcode.nl
  * Author URI: https://www.postcode.nl
  * Text Domain: postcodenl-address-autocomplete

diff --git a/src/PostcodeNl/AddressAutocomplete/Main.php b/src/PostcodeNl/AddressAutocomplete/Main.php
@@ -10,7 +10,7 @@
 class Main
 {
 	/** @var string The version number of the plugin should be equal to the commented version number in ../../../postcodenl-address-autocomplete.php */
-	public const VERSION = '2.0.1';
+	public const VERSION = '2.0.2';
 
 	/** @var self Reference to own */
 	protected static $_instance;

diff --git a/src/PostcodeNl/AddressAutocomplete/Proxy.php b/src/PostcodeNl/AddressAutocomplete/Proxy.php
@@ -41,6 +41,7 @@ public function autocomplete(): void
 	{
 		$this->_populateSession();
 		[$context, $term] = $this->_getParameters(2);
+		$term = wp_check_invalid_utf8(rawurldecode($term));
 
 		try
 		{
@@ -72,6 +73,7 @@ public function getDetails(): void
 	public function dutchAddressLookup(): void
 	{
 		[$postcode, $houseNumberAndAddition] = $this->_getParameters(2);
+		$houseNumberAndAddition = wp_check_invalid_utf8(rawurldecode($houseNumberAndAddition));
 
 		preg_match('/^(?<houseNumber>\d{1,5})(?<addition>\D.*)?$/', $houseNumberAndAddition, $matches);
 		$houseNumber = isset($matches['houseNumber']) ? (int)$matches['houseNumber'] : null;