@automattic/newspack-blocks 1.37.0 → 1.48.0

package/src/blocks/author-profile/view.php

@@ -26,16 +26,30 @@ function newspack_blocks_register_author_profile() {
 /**
  * Given a numeric ID, get the corresponding WP user or Co-authors Plus guest author.
  *
- * @param int $author_id Author ID to look up.
- * @param int $avatar_size Size of the avatar image to fetch.
+ * @param int     $author_id Author ID to look up.
+ * @param int     $avatar_size Size of the avatar image to fetch.
+ * @param boolean $hide_default If true, don't show default avatars.
  * @return object|boolean Author object in standardized format, or false if none exists.
  */
-function newspack_blocks_get_author_or_guest_author( $author_id, $avatar_size = 128 ) {
-	$author = false;
+function newspack_blocks_get_author_or_guest_author( $author_id, $avatar_size = 128, $hide_default = false ) {
+	$wp_user = get_user_by( 'id', $author_id );
+	$author  = false;
 
 	// First, see if the $author_id is a guest author.
 	if ( class_exists( 'CoAuthors_Guest_Authors' ) ) {
+		// Check if the ID given is a WP user with linked guest author.
+		$linked_guest_author = false;
+
+		if ( $wp_user ) {
+			$linked_guest_author = WP_REST_Newspack_Authors_Controller::get_linked_guest_author( $wp_user->user_login );
+		}
+
+		if ( $linked_guest_author && isset( $linked_guest_author->ID ) ) {
+			$author_id = $linked_guest_author->ID;
+		}
+
 		$author = ( new CoAuthors_Guest_Authors() )->get_guest_author_by( 'id', $author_id );
+		$avatar = function_exists( 'coauthors_get_avatar' ) ? coauthors_get_avatar( $author, $avatar_size ) : false;
 
 		// Format CAP guest author object to return to the render function.
 		if ( $author && isset( $author->ID ) ) {
@@ -43,22 +57,22 @@ function newspack_blocks_get_author_or_guest_author( $author_id, $avatar_size =
 				'id'     => $author_id,
 				'name'   => $author->display_name,
 				'bio'    => $author->description,
-				'avatar' => function_exists( 'coauthors_get_avatar' ) ? coauthors_get_avatar( $author, $avatar_size ) : false,
 				'url'    => esc_urL(
-					get_site_urL(
-						null,
-						'?author_name=' . get_post_meta( $author_id, 'cap-user_login', true )
-					)
+					get_author_posts_url( $author_id, $author->user_nicename )
 				),
 				'email'  => WP_REST_Newspack_Authors_Controller::get_email( $author_id ),
 				'social' => WP_REST_Newspack_Authors_Controller::get_social( $author_id ),
 			];
+
+			if ( $avatar && ( false === strpos( $avatar, 'avatar-default' ) || ! $hide_default ) ) {
+				$author['avatar'] = $avatar;
+			}
 		}
 	}
 
 	// If $author is still false, see if it's a standard WP User.
 	if ( ! $author ) {
-		$author = get_user_by( 'id', $author_id );
+		$author = $wp_user;
 
 		// Format WP user object to return to the render function.
 		if ( $author && isset( $author->data ) ) {
@@ -66,11 +80,15 @@ function newspack_blocks_get_author_or_guest_author( $author_id, $avatar_size =
 				'id'     => $author_id,
 				'name'   => $author->data->display_name,
 				'bio'    => get_the_author_meta( 'description', $author_id ),
-				'avatar' => get_avatar( $author_id, $avatar_size ),
 				'url'    => esc_urL( get_author_posts_url( $author_id ) ),
 				'email'  => WP_REST_Newspack_Authors_Controller::get_email( $author_id, false, $author->data->user_email ),
 				'social' => WP_REST_Newspack_Authors_Controller::get_social( $author_id ),
 			];
+
+			$avatar = get_avatar( $author_id, $avatar_size );
+			if ( $avatar && ( false === strpos( $avatar, 'avatar-default' ) || ! $hide_default ) ) {
+				$author['avatar'] = $avatar;
+			}
 		}
 	}
 
@@ -89,7 +107,7 @@ function newspack_blocks_render_block_author_profile( $attributes ) {
 	}
 
 	// Get the author by ID.
-	$author = newspack_blocks_get_author_or_guest_author( intval( $attributes['authorId'] ), intval( $attributes['avatarSize'] ) );
+	$author = newspack_blocks_get_author_or_guest_author( intval( $attributes['authorId'] ), intval( $attributes['avatarSize'] ), $attributes['avatarHideDefault'] );
 
 	// Bail if there's no author or guest author with the saved ID.
 	if ( empty( $author ) ) {
@@ -98,87 +116,15 @@ function newspack_blocks_render_block_author_profile( $attributes ) {
 
 	Newspack_Blocks::enqueue_view_assets( 'author-profile' );
 
-	// Whether to render links to the author's archive page.
-	$show_archive_link = $attributes['showArchiveLink'] && ! empty( $author['url'] );
-
-	// Combine social links and email, which are shown together.
-	$social_links = $attributes['showSocial'] && ! empty( $author['social'] ) ? $author['social'] : [];
-	if ( $attributes['showEmail'] && ! empty( $author['email'] ) ) {
-		$social_links['email'] = $author['email'];
-	}
-
-	// Add classes to the block.
-	$classes = Newspack_Blocks::block_classes( 'author-profile' );
-
-	if ( $attributes['avatarAlignment'] ) {
-		$classes .= ' avatar-' . $attributes['avatarAlignment'];
-	}
-
-	if ( isset( $attributes['className'] ) ) {
-		$classes .= ' ' . $attributes['className'];
-	}
+	$content = Newspack_Blocks::template_include(
+		'author-profile-card',
+		[
+			'attributes' => $attributes,
+			'author'     => $author,
+		]
+	);
 
-	ob_start();
-
-	?>
-	<div class="<?php echo esc_attr( $classes ); ?>">
-		<?php if ( $attributes['showAvatar'] && $author['avatar'] ) : ?>
-			<div class="wp-block-newspack-blocks-author-profile__avatar">
-				<figure style="border-radius: <?php echo esc_attr( $attributes['avatarBorderRadius'] ); ?>; width: <?php echo esc_attr( $attributes['avatarSize'] ); ?>px;">
-					<?php echo wp_kses_post( $author['avatar'] ); ?>
-				</figure>
-			</div>
-		<?php endif; ?>
-		<div class="wp-block-newspack-blocks-author-profile__bio">
-			<h3>
-				<?php if ( $show_archive_link ) : ?>
-				<a href="<?php echo esc_url( $author['url'] ); ?>">
-				<?php endif; ?>
-					<?php echo esc_html( $author['name'] ); ?>
-				<?php if ( $show_archive_link ) : ?>
-				</a>
-				<?php endif; ?>
-			</h3>
-
-			<?php if ( $attributes['showBio'] && ! empty( $author['bio'] ) ) : ?>
-				<?php
-				$bio = $author['bio'];
-
-				if ( $show_archive_link ) {
-					$bio .= sprintf(
-						// Translators: "more by this author" link.
-						__( ' <a href="%1$s">More by %2$s</a>', 'newspack-blocks' ),
-						$author['url'],
-						$author['name']
-					);
-				}
-
-				echo wp_kses_post( wpautop( $bio ) );
-				?>
-			<?php endif; ?>
-
-			<?php if ( $attributes['showEmail'] || $attributes['showSocial'] ) : ?>
-				<ul class="wp-block-newspack-blocks-author-profile__social-links">
-					<?php foreach ( $social_links as $service => $social_data ) : ?>
-						<li>
-							<a href="<?php echo esc_url( $social_data['url'] ); ?>">
-								<?php if ( ! empty( $social_data['svg'] ) ) : ?>
-									<span>
-										<?php echo Newspack_Blocks::sanitize_svg( $social_data['svg'] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-									</span>
-								<?php endif; ?>
-								<span class="<?php echo ! empty( $social_data['svg'] ) ? esc_attr( 'hidden' ) : esc_attr( 'visible' ); ?>">
-									<?php echo esc_html( $service ); ?>
-								</span>
-							</a>
-						</li>
-					<?php endforeach; ?>
-				</ul>
-			<?php endif; ?>
-		</div>
-	</div>
-	<?php
-	return ob_get_clean();
+	return $content;
 }
 
 add_action( 'init', 'newspack_blocks_register_author_profile' );

package/src/blocks/author-profile/view.scss

@@ -1 +1,120 @@
-@import './shared';
+@import '../../shared/sass/variables';
+@import '../../shared/sass/mixins';
+
+.wp-block-newspack-blocks-author-profile {
+	@include media( mobile ) {
+		display: flex;
+	}
+
+	+ .wp-block-newspack-blocks-author-profile {
+		margin-top: 2.5rem;
+	}
+
+	h3 {
+		margin-bottom: 0.5em;
+	}
+
+	p {
+		font-size: 1em !important;
+	}
+
+	&.text-size-small {
+		font-size: 0.75em;
+	}
+
+	&.text-size-large {
+		font-size: 1.25em;
+	}
+
+	&.text-size-extra-large {
+		font-size: 1.5em;
+	}
+
+	&__avatar {
+		@include media( mobile ) {
+			flex: 0 1 auto;
+			margin-right: 1.5em;
+		}
+
+		figure {
+			margin: 0;
+			overflow: hidden;
+		}
+
+		.avatar {
+			border-radius: 0;
+			display: block;
+			height: 100%;
+			max-width: none;
+			object-fit: cover;
+			width: 100%;
+		}
+	}
+
+	&__bio {
+		@include media( mobile ) {
+			flex: 4;
+
+			h3 {
+				margin-top: 0;
+			}
+		}
+	}
+
+	&__social-links {
+		display: flex;
+		flex-wrap: wrap;
+		list-style: none;
+		margin: -8px;
+		padding: 0;
+
+		li {
+			margin: 8px;
+		}
+
+		a,
+		svg {
+			display: block;
+		}
+
+		svg {
+			fill: currentColor;
+		}
+	}
+
+	.hidden {
+		display: none;
+	}
+
+	// Avatar: Right
+	&.avatar-right {
+		@include media( mobile ) {
+			.wp-block-newspack-blocks-author-profile__avatar {
+				margin-left: 1.5em;
+				margin-right: 0;
+				order: 2;
+			}
+		}
+	}
+
+	// Style: Center
+	&.is-style-center {
+		display: block;
+
+		.wp-block-newspack-blocks-author-profile__avatar {
+			margin: 0 0 1.5em;
+
+			figure {
+				margin: 0 auto;
+			}
+		}
+
+		.wp-block-newspack-blocks-author-profile__bio {
+			text-align: center;
+		}
+
+		.wp-block-newspack-blocks-author-profile__social-links {
+			justify-content: center;
+		}
+	}
+}

package/src/blocks/carousel/create-swiper.js

@@ -4,8 +4,10 @@
 import { speak } from '@wordpress/a11y';
 import { escapeHTML } from '@wordpress/escape-html';
 import { __, sprintf } from '@wordpress/i18n';
-import Swiper from 'swiper';
-import 'swiper/dist/css/swiper.css';
+// eslint-disable-next-line import/no-unresolved
+import Swiper from 'swiper/bundle';
+// eslint-disable-next-line import/no-unresolved
+import 'swiper/css/bundle';
 
 const autoplayClassName = 'wp-block-newspack-blocks-carousel__autoplay-playing';
 
@@ -104,6 +106,7 @@ export default function createSwiper( els, config = {} ) {
 				) }</span></button>`;
 			},
 		},
+		watchSlidesProgress: config.slidesPerView > 1,
 		preventClicksPropagation: false, // Necessary for normal block interactions.
 		releaseFormElements: false,
 		setWrapperSize: true,
@@ -111,9 +114,15 @@ export default function createSwiper( els, config = {} ) {
 		spaceBetween: 16,
 		touchStartPreventDefault: false,
 		breakpoints: {
-			600: {
+			320: {
+				slidesPerView: 1,
+			},
+			782: {
 				slidesPerView: config.slidesPerView > 1 ? 2 : 1,
 			},
+			1168: {
+				slidesPerView: config.slidesPerView,
+			},
 		},
 		on: {
 			init() {
@@ -135,7 +144,7 @@ export default function createSwiper( els, config = {} ) {
 				 * If we're autoplaying, don't announce the slide change, as that would
 				 * be supremely annoying.
 				 */
-				if ( ! this.autoplay.running ) {
+				if ( ! this.autoplay?.running ) {
 					// Announce the contents of the slide.
 					const currentImage = currentSlide.querySelector( 'img' );
 					const alt = currentImage ? currentImage?.alt : false;
@@ -144,7 +153,7 @@ export default function createSwiper( els, config = {} ) {
 						/* translators: 1: current slide number and 2: total number of slides */
 						__( 'Slide %1$s of %2$s', 'newspack-blocks' ),
 						this.realIndex + 1,
-						this.pagination.bullets.length
+						this.pagination?.bullets?.length || 0
 					);
 
 					speak(

package/src/blocks/carousel/edit.js

@@ -174,7 +174,9 @@ class Edit extends Component {
 		const classes = classnames(
 			className,
 			'wp-block-newspack-blocks-carousel', // Default to make styles work for third-party consumers.
-			'swiper-container',
+			'wpnbpc', // Shortened version of the default classname.
+			'slides-per-view-' + slidesPerView,
+			'swiper',
 			{
 				'wp-block-newspack-blocks-carousel__autoplay-playing': autoplay,
 				'newspack-block--disabled': isUIDisabled,
@@ -339,7 +341,7 @@ class Edit extends Component {
 										ref={ this.btnNextRef }
 									/>
 									<div
-										className="swiper-pagination-bullets amp-pagination"
+										className="swiper-pagination swiper-pagination-bullets amp-pagination"
 										ref={ this.paginationRef }
 									/>
 								</>

package/src/blocks/carousel/editor.scss

@@ -1,6 +1,6 @@
 @import '../../shared/sass/placeholder';
 
-.wp-block-newspack-blocks-carousel {
+.wpnbpc {
 	.swiper-wrapper {
 		height: auto;
 		pointer-events: none;
@@ -47,16 +47,7 @@
 		}
 	}
 }
-.editor-block-list__layout
-	.editor-block-list__block
-	.wp-block-newspack-blocks-carousel
-	.entry-title
-	a,
-.editor-block-list__layout
-	.editor-block-list__block
-	.wp-block-newspack-blocks-carousel
-	.entry-meta
-	.byline
-	a {
+.editor-block-list__layout .editor-block-list__block .wpnbpc .entry-title a,
+.editor-block-list__layout .editor-block-list__block .wpnbpc .entry-meta .byline a {
 	color: inherit;
 }

package/src/blocks/carousel/view.js

@@ -20,7 +20,7 @@ if ( typeof window !== 'undefined' ) {
 			createSwiper(
 				{
 					block,
-					container: block.querySelector( '.swiper-container' ),
+					container: block.querySelector( '.swiper' ),
 					prev: block.querySelector( '.swiper-button-prev' ),
 					next: block.querySelector( '.swiper-button-next' ),
 					pagination: block.querySelector( '.swiper-pagination-bullets' ),

package/src/blocks/carousel/view.php

@@ -23,12 +23,14 @@ function newspack_blocks_render_block_carousel( $attributes ) {
 	$autoplay = isset( $attributes['autoplay'] ) ? $attributes['autoplay'] : false;
 	$delay    = isset( $attributes['delay'] ) ? absint( $attributes['delay'] ) : 3;
 	$authors  = isset( $attributes['authors'] ) ? $attributes['authors'] : array();
-	$is_amp   = function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
+	$is_amp   = Newspack_Blocks::is_amp();
 
 	$other = array();
 	if ( $autoplay ) {
 		$other[] = 'wp-block-newspack-blocks-carousel__autoplay-playing';
 	}
+	$other[] = 'slides-per-view-' . $attributes['slidesPerView'];
+	$other[] = 'wpnbpc';
 	$classes = Newspack_Blocks::block_classes( 'carousel', $attributes, $other );
 
 	$article_query = new WP_Query( Newspack_Blocks::build_articles_query( $attributes, apply_filters( 'newspack_blocks_block_name', 'newspack-blocks/carousel' ) ) );
@@ -252,21 +254,23 @@ function newspack_blocks_render_block_carousel( $attributes ) {
 	$slides_to_show  = $slides_per_view <= $counter ? $slides_per_view : $counter;
 
 	if ( $is_amp ) {
-		$selector    = sprintf(
+		$selector = sprintf(
 			'<amp-selector id="wp-block-newspack-carousel__amp-pagination__%1$d" class="swiper-pagination-bullets amp-pagination" on="select:wp-block-newspack-carousel__amp-carousel__%1$d.goToSlide(index=event.targetOption)" layout="container" %2$s>%3$s</amp-selector>',
 			absint( $newspack_blocks_carousel_id ),
 			$attributes['hideControls'] ? 'aria-hidden="true"' : '',
 			implode( '', $buttons )
 		);
+
 		$carousel    = sprintf(
-			'<amp-base-carousel class="wp-block-newspack-carousel__amp-carousel" width="%1$s" height="%2$s" layout="responsive" snap="true" type="slides" data-next-button-aria-label="%3$s" data-prev-button-aria-label="%4$s" controls loop %5$s id="wp-block-newspack-carousel__amp-carousel__%6$s" on="slideChange:wp-block-newspack-carousel__amp-pagination__%6$s.toggle(index=event.index, value=true)" advance-count="1" visible-count="%7$s">%8$s</amp-base-carousel>',
+			'<amp-base-carousel class="wp-block-newspack-carousel__amp-carousel" width="%1$s" height="%2$s" heights="%3$s" layout="responsive" snap="true" data-next-button-aria-label="%4$s" data-prev-button-aria-label="%5$s" controls="auto" loop="true" %6$s id="wp-block-newspack-carousel__amp-carousel__%7$s" on="slideChange:wp-block-newspack-carousel__amp-pagination__%7$s.toggle(index=event.index, value=true)" advance-count="1" visible-count="%8$s">%9$s</amp-base-carousel>',
 			$attributes['slidesPerView'] * 1,
 			$attributes['aspectRatio'],
+			'(min-width: 1168px) ' . ( $attributes['aspectRatio'] / $slides_to_show * 100 ) . '% !important, (min-width: 782px) ' . ( $slides_to_show > 1 ? ( $attributes['aspectRatio'] / 2 * 100 ) . '% !important' : ( $attributes['aspectRatio'] * 100 ) . '% !important' ) . ', ' . ( $attributes['aspectRatio'] * 100 ) . '% !important',
 			esc_attr__( 'Next Slide', 'newspack-blocks' ),
 			esc_attr__( 'Previous Slide', 'newspack-blocks' ),
 			$autoplay ? 'auto-advance="true" auto-advance-interval=' . esc_attr( $delay * 1000 ) : '',
 			absint( $newspack_blocks_carousel_id ),
-			'(min-width: 600px) ' . $slides_to_show . ', ' . ( $slides_to_show > 1 ? 2 : 1 ),
+			'(min-width: 1168px) ' . $slides_to_show . ', (min-width: 782px) ' . ( $slides_to_show > 1 ? 2 : 1 ) . ', ' . 1,
 			$slides
 		);
 		$autoplay_ui = $autoplay ? newspack_blocks_carousel_block_autoplay_ui_amp( $newspack_blocks_carousel_id ) : '';
@@ -283,7 +287,7 @@ function newspack_blocks_render_block_carousel( $attributes ) {
 			$attributes['hideControls'] ? 'aria-hidden="true"' : ''
 		);
 		$carousel    = sprintf(
-			'<div class="swiper-container"><div class="swiper-wrapper">%s</div>%s</div>',
+			'<div class="swiper"><div class="swiper-wrapper">%s</div>%s</div>',
 			$slides,
 			$navigation
 		);

package/src/blocks/carousel/view.scss

@@ -2,7 +2,7 @@
 @import '../../shared/sass/mixins';
 @import '../../shared/sass/colors';
 
-.wp-block-newspack-blocks-carousel {
+.wpnbpc {
 	position: relative;
 	margin-top: 0;
 
@@ -80,6 +80,7 @@
 	.post-thumbnail {
 		margin: 0;
 		height: 100%;
+		width: 100%;
 		padding: 0;
 		position: relative;
 		a,
@@ -177,11 +178,11 @@
 		margin-top: -24px;
 	}
 	.swiper-button-prev::after,
-	.swiper-container-rtl .swiper-button-next::after {
+	.swiper-rtl .swiper-button-next::after {
 		content: none;
 	}
 	.swiper-button-next::after,
-	.swiper-container-rtl .swiper-button-prev::after {
+	.swiper-rtl .swiper-button-prev::after {
 		content: none;
 	}
 	.amp-carousel-button-next,
@@ -305,4 +306,29 @@
 			visibility: hidden;
 		}
 	}
+
+	&[data-slides-per-view='2'] article {
+		.entry-title {
+			@include media( tablet ) {
+				font-size: 1.4em;
+			}
+		}
+	}
+
+	&.slides-per-view-3 article,
+	&.slides-per-view-4 article {
+		.entry-title {
+			@include media( tablet ) {
+				font-size: 1.2em;
+			}
+			@include media( desktop ) {
+				font-size: 1em;
+			}
+		}
+		.entry-meta {
+			@include media( tablet ) {
+				font-size: 0.7em;
+			}
+		}
+	}
 }

package/src/blocks/donate/class-wp-rest-newspack-donate-controller.php

@@ -13,6 +13,8 @@
 class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 // phpcs:enable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedClassFound
 
+	private static $current_user_id = 0; // phpcs:ignore Squiz.Commenting.VariableComment.Missing
+
 	/**
 	 * Constructs the controller.
 	 *
@@ -29,13 +31,15 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 	 * @access public
 	 */
 	public function register_routes() {
+		self::$current_user_id = get_current_user_id();
+
 		register_rest_route(
 			$this->namespace,
 			'/' . $this->rest_base,
 			[
 				[
 					'methods'             => WP_REST_Server::EDITABLE,
-					'callback'            => [ $this, 'process_donation' ],
+					'callback'            => [ $this, 'api_process_donation' ],
 					'args'                => [
 						'tokenData'         => [
 							'type'       => 'object',
@@ -71,6 +75,12 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 						'newsletter_opt_in' => [
 							'sanitize_callback' => 'rest_sanitize_boolean',
 						],
+						'agree_to_pay_fees' => [
+							'sanitize_callback' => 'rest_sanitize_boolean',
+						],
+						'payment_method_id' => [
+							'sanitize_callback' => 'sanitize_text_field',
+						],
 					],
 					'permission_callback' => '__return_true',
 				],
@@ -84,13 +94,9 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response
 	 */
-	public function process_donation( $request ) {
+	public function api_process_donation( $request ) {
 		$payment_metadata = [
-			'referer'            => wp_get_referer(),
-			// Experimental NRH integration metadata.
-			'schema_version'     => '1.0',
-			'source'             => 'newspack',
-			'agreed_to_pay_fees' => false,
+			'referer' => wp_get_referer(),
 		];
 		if ( class_exists( 'Newspack\NRH' ) && method_exists( 'Newspack\NRH', 'get_nrh_config' ) ) {
 			$nrh_config = \Newspack\NRH::get_nrh_config();
@@ -101,29 +107,21 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 
 		$response = \Newspack\Stripe_Connection::handle_donation(
 			[
-				'frequency'        => $request->get_param( 'frequency' ),
-				'token_data'       => $request->get_param( 'tokenData' ),
-				'email_address'    => $request->get_param( 'email' ),
-				'full_name'        => $request->get_param( 'full_name' ),
-				'amount'           => $request->get_param( 'amount' ),
-				'client_metadata'  => [
+				'frequency'         => $request->get_param( 'frequency' ),
+				'token_data'        => $request->get_param( 'tokenData' ),
+				'email_address'     => $request->get_param( 'email' ),
+				'full_name'         => $request->get_param( 'full_name' ),
+				'amount'            => $request->get_param( 'amount' ),
+				'client_metadata'   => [
 					'clientId'        => $request->get_param( 'clientId' ),
 					'newsletterOptIn' => $request->get_param( 'newsletter_opt_in' ),
+					'userId'          => self::$current_user_id,
 				],
-				'payment_metadata' => $payment_metadata,
+				'payment_metadata'  => $payment_metadata,
+				'payment_method_id' => $request->get_param( 'payment_method_id' ),
 			]
 		);
 
 		return rest_ensure_response( $response );
 	}
-
-	/**
-	 * Retrieve Stripe data.
-	 */
-	public static function get_payment_data() {
-		if ( ! Newspack_Blocks::is_rendering_streamlined_block() ) {
-			return [];
-		}
-		return \Newspack\Stripe_Connection::get_stripe_data();
-	}
 }