Merge pull request #30 from daanrijpkemacb/1.3.29

1.3.29

Author: daanrijpkemacb

bluem-idin.php

@@ -1054,15 +1054,7 @@ function bluem_idin_shortcode_callback(): void
     /**
      * Determining the right callback.
      */
-    $goto = $bluem_config->IDINPageURL;
-
-    if (str_contains(sanitize_url(wp_unslash($_SERVER['REQUEST_URI'])), 'bluem-woocommerce/idin_shortcode_callback/go_to_cart')) {
-        $goto = wc_get_checkout_url();
-    } elseif (!empty($goto)) {
-        $goto = home_url($bluem_config->IDINPageURL);
-    } else {
-        $goto = home_url();
-    }
+	$goto = bluem_get_idin_shortcode_callback_url( $bluem_config );
 
     switch ($statusCode) {
         case 'Success': // in case of success...
@@ -1253,6 +1245,29 @@ function bluem_idin_shortcode_callback(): void
     exit;
 }
 
+/**
+ * Determine the Callback URL for the iDIN shortcode flow
+ * @param Stdclass $bluem_config
+ *
+ * @return string
+ */
+function bluem_get_idin_shortcode_callback_url( Stdclass $bluem_config ): string {
+
+	if ( str_contains( sanitize_url( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'bluem-woocommerce/idin_shortcode_callback/go_to_cart' ) ) {
+		return wc_get_checkout_url();
+	} elseif ( ! empty( $bluem_config->IDINPageURL ) ) {
+	    $callbackUrl = (string) $bluem_config->IDINPageURL;
+
+		// if goto is relative URL, append it with the home URL of WordPress
+		if ( ! str_starts_with( $callbackUrl, 'http://' ) && ! str_starts_with( $callbackUrl, 'https://' ) ) {
+			return home_url( $bluem_config->IDINPageURL );
+		}
+        // else just use goto
+        return $callbackUrl;
+	}
+    return home_url();
+}
+
 /**
  * Identity webhook action
  *

bluem.php

@@ -2,7 +2,7 @@
 
 /**
  * Plugin Name: Bluem ePayments, iDIN, eMandates services and integration for WooCommerce
- * Version: 1.3.28
+ * Version: 1.3.29
  * Plugin URI: https://bluem.nl/en/
  * Description: Bluem integration for WordPress and WooCommerce for Payments, eMandates, iDIN identity verification and more
  * Author: Bluem Payment Services

readme.txt

@@ -4,7 +4,7 @@ Tags: Bluem,Payments,iDIN,iDEAL,eMandates
 Requires at least: 5.0
 Tested up to: 6.6
 Requires PHP: 8.0
-Stable tag: 1.3.28
+Stable tag: 1.3.29
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -77,6 +77,7 @@ Shortcode: `[bluem_identificatieformulier]`
 It is possible to programmatically block display and functionality on your site based on the verification status. Please contact us if you are interested in developing this in your site.
 
 == Changelog ==
+- 1.3.29: Callback URL fix for iDIN shortcode
 - 1.3.28: Refactor SNS to ASN and update BIC list
 - 1.3.27: Certificate update (yearly refresh)
 - 1.3.26: Stability fixes and improvements for Contact Form integration