fix: content gate metadata methods and params

Author: dkoo

includes/data-events/class-memberships.php

@@ -7,7 +7,7 @@
 
 namespace Newspack\Data_Events;
 
-use Newspack\Memberships as NewspackMemberships;
+use Newspack\Content_Gate;
 use Newspack\Reader_Activation;
 use Newspack\Data_Events;
 use WP_Error;
@@ -17,7 +17,7 @@
  */
 final class Memberships {
 
-	const METADATA_NAME = 'memberships_content_gate';
+	const METADATA_NAME = 'gate_post_id';
 
 	/**
 	 * The name of the action for form submissions
@@ -74,7 +74,7 @@ public static function checkout_cart_item_data( $cart_item_data ) {
 	 */
 	public static function checkout_create_order_line_item( $item, $cart_item_key, $values, $order ) {
 		if ( ! empty( $values[ self::METADATA_NAME ] ) ) {
-			$order->add_meta_data( '_memberships_content_gate', $values[ self::METADATA_NAME ] );
+			$order->add_meta_data( '_gate_post_id', $values[ self::METADATA_NAME ] );
 		}
 	}
 
@@ -149,7 +149,7 @@ public static function registration_submission( $email, $authenticate, $user_id,
 			return;
 		}
 		$data = array_merge(
-			NewspackMemberships::get_gate_metadata(),
+			Content_Gate::get_gate_metadata(),
 			[
 				'action'      => self::FORM_SUBMISSION,
 				'action_type' => 'registration',
@@ -182,7 +182,7 @@ public static function registration_submission_with_status( $email, $authenticat
 			$action = self::FORM_SUBMISSION_FAILURE;
 		}
 		$data = array_merge(
-			NewspackMemberships::get_gate_metadata(),
+			Content_Gate::get_gate_metadata(),
 			[
 				'action'      => $action,
 				'action_type' => 'registration',
@@ -202,13 +202,13 @@ public static function registration_submission_with_status( $email, $authenticat
 	 * @return ?array
 	 */
 	private static function get_order_data( $order_id, $order ) {
-		$is_from_gate = $order->get_meta( '_memberships_content_gate' );
+		$is_from_gate = $order->get_meta( '_gate_post_id' ) ? $order->get_meta( '_gate_post_id' ) : $order->get_meta( '_memberships_content_gate' ); // Handle legacy _memberships_content_gate meta key.
 		if ( ! $is_from_gate ) {
 			return;
 		}
 		$item = array_shift( $order->get_items() );
 		$data = array_merge(
-			NewspackMemberships::get_gate_metadata(),
+			Content_Gate::get_gate_metadata(),
 			[
 				'action_type' => 'paid_membership',
 				'order_id'    => $order_id,

includes/plugins/wc-memberships/class-memberships.php

@@ -7,6 +7,7 @@
 
 namespace Newspack;
 
+use Newspack\Content_Gate;
 use Newspack\WooCommerce_Connection;
 
 defined( 'ABSPATH' ) || exit;

src/blocks/content-gate/countdown-box/class-content-gate-countdown-box-block.php

@@ -10,7 +10,7 @@
 defined( 'ABSPATH' ) || exit;
 
 use Newspack\Memberships;
-use Newspack\Memberships\Metering;
+use Newspack\Metering;
 use Newspack\Content_Gate_Countdown_Block;
 
 /**

src/content-gate/gate.js

@@ -103,7 +103,7 @@ function initReloadHandler() {
 }
 
 /**
- * Adds 'memberships_content_gate' hidden input to every form inside the gate.
+ * Adds 'gate_post_id' hidden input to every form inside the gate.
  *
  * @param {HTMLElement} gate The gate element.
  */
@@ -115,10 +115,10 @@ function addFormInputs( gate ) {
 		...gate.querySelectorAll( '.wp-block-newspack-blocks-donate form' ), // Donate block.
 	];
 	forms.forEach( form => {
-		if ( ! form.querySelector( 'input[name="memberships_content_gate"]' ) ) {
+		if ( ! form.querySelector( 'input[name="gate_post_id"]' ) ) {
 			const input = document.createElement( 'input' );
 			input.type = 'hidden';
-			input.name = 'memberships_content_gate';
+			input.name = 'gate_post_id';
 			input.value = newspack_content_gate.metadata?.gate_post_id || '1';
 			form.appendChild( input );
 			form.addEventListener( 'submit', evt => handleFormSubmission( evt, gate ) );

src/reader-activation-auth/auth-form.js

@@ -288,8 +288,8 @@ window.newspackRAS.push( function ( readerActivation ) {
 						readerActivation.setAuthenticated( !! data.authenticated );
 						const activity = { email: data.email };
 						const body = new FormData( form );
-						if ( data.metadata?.gate_post_id || body.has( 'memberships_content_gate' ) ) {
-							activity.gate_post_id = data.metadata.gate_post_id || body.get( 'memberships_content_gate' );
+						if ( data.metadata?.gate_post_id || body.has( 'gate_post_id' ) ) {
+							activity.gate_post_id = data.metadata.gate_post_id || body.get( 'gate_post_id' );
 						}
 						if ( data.metadata?.newspack_popup_id || body.has( 'newspack_popup_id' ) ) {
 							activity.newspack_popup_id = data.metadata.newspack_popup_id || body.get( 'newspack_popup_id' );