From 62bf98c16a17c877324e218c877ad7c33265b3bd Mon Sep 17 00:00:00 2001
From: Rasmy Nguyen <raz@automattic.com>
Date: Fri, 18 Oct 2024 16:33:07 -0400
Subject: [PATCH 01/17] feat(site-kit): add logging when site kit disconnects
 (#3472)

This PR adds newspack manager logging whenever we detect a site kit disconnection via:
- the delete_option_{option} hook for the has_connected_admin option.
- the update_user_metadata hook for when the disconnected_reason user meta is updated.
- a cron job that checks to see if there are any admin connection daily
---
 includes/class-logger.php                     |  37 +++++
 includes/class-newspack.php                   |   1 +
 .../class-googlesitekit-logger.php            | 141 ++++++++++++++++++
 .../google-site-kit/class-googlesitekit.php   |  11 +-
 4 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 includes/plugins/google-site-kit/class-googlesitekit-logger.php

diff --git a/includes/class-logger.php b/includes/class-logger.php
index 4bf48a977f..6a31567744 100644
--- a/includes/class-logger.php
+++ b/includes/class-logger.php
@@ -76,4 +76,41 @@ private static function get_pid() {
 	public static function error( $payload, $header = 'NEWSPACK' ) {
 		return self::log( $payload, $header, 'error' );
 	}
+
+	/**
+	 * A logger for newspack manager logging.
+	 *
+	 * @param string $code      The log code (i.e. newspack_google_login).
+	 * @param string $message   The message to log.
+	 * @param array  $data      The data to log.
+	 *      Optional. Additional parameters.
+	 *      @type string $user_email The current users email address.
+	 *      @type file   $file       The name of the file to write the local log to.
+	 * @param string $type      The type of log. Defaults to 'error'.
+	 * @param string $log_level The Log level.
+	 */
+	public static function newspack_log( $code, $message, $data, $type = 'error', $log_level = 2 ) {
+		$email = '';
+		if ( isset( $data['user_email'] ) ) {
+			$email = $data['user_email'];
+			unset( $data['user_email'] );
+		}
+		$file = $code;
+		if ( isset( $data['file'] ) ) {
+			$file = $data['file'];
+			unset( $data['file'] );
+		}
+		do_action(
+			'newspack_log',
+			$code,
+			$message,
+			[
+				'type'       => $type,
+				'data'       => $data,
+				'user_email' => $email,
+				'file'       => $file,
+				'log_level'  => $log_level,
+			]
+		);
+	}
 }
diff --git a/includes/class-newspack.php b/includes/class-newspack.php
index 0be50a7634..8f844d245c 100644
--- a/includes/class-newspack.php
+++ b/includes/class-newspack.php
@@ -155,6 +155,7 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-jetpack.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-gravityforms.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/google-site-kit/class-googlesitekit.php';
+		include_once NEWSPACK_ABSPATH . 'includes/plugins/google-site-kit/class-googlesitekit-logger.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-mailchimp-for-woocommerce.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-onesignal.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-organic-profile-block.php';
diff --git a/includes/plugins/google-site-kit/class-googlesitekit-logger.php b/includes/plugins/google-site-kit/class-googlesitekit-logger.php
new file mode 100644
index 0000000000..4c421f4868
--- /dev/null
+++ b/includes/plugins/google-site-kit/class-googlesitekit-logger.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Google Site Kit Logger class.
+ *
+ * @package Newspack
+ */
+
+namespace Newspack;
+
+use Google\Site_Kit\Core\Authentication\Has_Connected_Admins;
+use Google\Site_Kit\Core\Authentication\Disconnected_Reason;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Main class.
+ */
+class GoogleSiteKit_Logger {
+	/**
+	 * The hook name for site kit disconnection logger cron job.
+	 */
+	const CRON_HOOK = 'newspack_googlesitekit_disconnection_logger';
+
+	/**
+	 * The log code for disconnections.
+	 */
+	const LOG_CODE_DISCONNECTED = 'newspack_googlesitekit_disconnected';
+
+	/**
+	 * Initialize hooks and filters.
+	 */
+	public static function init() {
+		if ( GoogleSiteKit::is_active() ) {
+			add_action( 'admin_init', [ __CLASS__, 'cron_init' ] );
+			add_action( 'delete_option_' . self::get_sitekit_ga4_has_connected_admin_option_name(), [ __CLASS__, 'log_disconnected_admins' ] );
+			add_filter( 'update_user_metadata', [ __CLASS__, 'maybe_log_disconnected_reason' ], 10, 5 );
+			add_action( self::CRON_HOOK, [ __CLASS__, 'handle_cron_event' ] );
+		}
+	}
+
+	/**
+	 * Schedule cron job to check for site kit connection. If the connection is lost we log it.
+	 */
+	public static function cron_init() {
+		register_deactivation_hook( NEWSPACK_PLUGIN_FILE, [ __CLASS__, 'cron_deactivate' ] );
+
+		if ( defined( 'NEWSPACK_CRON_DISABLE' ) && is_array( NEWSPACK_CRON_DISABLE ) && in_array( self::CRON_HOOK, NEWSPACK_CRON_DISABLE, true ) ) {
+			self::cron_deactivate();
+		} elseif ( ! wp_next_scheduled( self::CRON_HOOK ) ) {
+			wp_schedule_event( time(), 'daily', self::CRON_HOOK );
+		}
+	}
+
+	/**
+	 * Deactivate the cron job.
+	 */
+	public static function cron_deactivate() {
+		wp_clear_scheduled_hook( self::CRON_HOOK );
+	}
+
+
+	/**
+	 * Get the name of the option under which Site Kit's GA4 has connected admin flag is stored.
+	 */
+	private static function get_sitekit_ga4_has_connected_admin_option_name() {
+		if ( class_exists( 'Google\Site_Kit\Core\Authentication\Has_Connected_Admins' ) ) {
+			return Has_Connected_Admins::OPTION;
+		}
+		return 'googlesitekit_has_connected_admins';
+	}
+
+	/**
+	 * Get the name of the option under which Site Kit's disconnected reason is stored.
+	 */
+	private static function get_sitekit_ga4_disconnected_reason_option_name() {
+		if ( class_exists( 'Google\Site_Kit\Core\Authentication\Disconnected_Reason' ) ) {
+			return Disconnected_Reason::OPTION;
+		}
+		return 'googlesitekit_disconnected_reason';
+	}
+
+	/**
+	 * Logs disconnect reason when user meta update is triggered.
+	 *
+	 * @param bool   $check      Whether to update metadata.
+	 * @param int    $object_id  Object ID.
+	 * @param string $meta_key   Meta key.
+	 * @param mixed  $meta_value Meta value.
+	 * @param mixed  $prev_value Previous meta value.
+	 */
+	public static function maybe_log_disconnected_reason( $check, $object_id, $meta_key, $meta_value, $prev_value ) {
+		if (
+			// The meta key will have the database prefixed so we need to use str_contains.
+			str_contains( $meta_key, self::get_sitekit_ga4_disconnected_reason_option_name() ) &&
+			$meta_value !== $prev_value
+		) {
+			self::log(
+				self::LOG_CODE_DISCONNECTED,
+				'Google Site Kit has been disconnected with reason ' . $meta_value
+			);
+		}
+		return $check;
+	}
+
+	/**
+	 * Logs when cron event runs and all admins are disconnected.
+	 */
+	public static function handle_cron_event() {
+		if ( ! get_option( self::get_sitekit_ga4_has_connected_admin_option_name(), false ) ) {
+			self::log( self::LOG_CODE_DISCONNECTED, 'No active Google Site Kit connections found', false, 3 );
+		}
+	}
+
+	/**
+	 * Log when all admins are disconnected.
+	 */
+	public static function log_disconnected_admins() {
+		self::log( self::LOG_CODE_DISCONNECTED, 'Google Site Kit has been disconnected for all admins' );
+	}
+
+	/**
+	 * Main site kit logger.
+	 *
+	 * @param string $code      The code for the log.
+	 * @param string $message   The message to log. Optional.
+	 * @param bool   $backtrace Whether to include a backtrace.
+	 * @param int    $log_level The log level.
+	 */
+	private static function log( $code, $message, $backtrace = true, $log_level = 2 ) {
+		$data = [
+			'file'       => $code,
+			'user_email' => wp_get_current_user()->user_email,
+		];
+		if ( $backtrace ) {
+			$e                 = new \Exception();
+			$data['backtrace'] = $e->getTraceAsString();
+		}
+		Logger::newspack_log( $code, $message, $data, 'error', $log_level );
+	}
+}
+GoogleSiteKit_Logger::init();
diff --git a/includes/plugins/google-site-kit/class-googlesitekit.php b/includes/plugins/google-site-kit/class-googlesitekit.php
index 704740aec2..e6a25e50c2 100644
--- a/includes/plugins/google-site-kit/class-googlesitekit.php
+++ b/includes/plugins/google-site-kit/class-googlesitekit.php
@@ -70,6 +70,15 @@ public static function insert_ga4_analytics() {
 		<?php
 	}
 
+	/**
+	 * Get whether Site Kit is active.
+	 *
+	 * @return bool Whether Site Kit is active.
+	 */
+	public static function is_active() {
+		return class_exists( 'Google\Site_Kit\Core\Modules\Module' );
+	}
+
 	/**
 	 * Get whether the current user is connected.
 	 *
@@ -111,7 +120,7 @@ private static function get_sitekit_ga4_settings() {
 	 * Fetch data for the GA account data and set up GA4.
 	 */
 	public static function setup_sitekit_ga4() {
-		if ( ! class_exists( 'Google\Site_Kit\Core\Modules\Module' ) ) {
+		if ( ! self::is_active() ) {
 			return;
 		}
 		require_once NEWSPACK_ABSPATH . 'includes/plugins/google-site-kit/class-googlesitekitanalytics.php';

From 4911b4c9eb3fadefcb88e6bad98e06b28d5cab52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:03:33 +0000
Subject: [PATCH 02/17] chore(deps-dev): bump @wordpress/browserslist-config

Bumps [@wordpress/browserslist-config](https://github.com/WordPress/gutenberg/tree/HEAD/packages/browserslist-config) from 6.9.0 to 6.10.0.
- [Release notes](https://github.com/WordPress/gutenberg/releases)
- [Changelog](https://github.com/WordPress/gutenberg/blob/trunk/packages/browserslist-config/CHANGELOG.md)
- [Commits](https://github.com/WordPress/gutenberg/commits/@wordpress/browserslist-config@6.10.0/packages/browserslist-config)

---
updated-dependencies:
- dependency-name: "@wordpress/browserslist-config"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54c2fabe33..ec960a49ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
 				"@testing-library/react": "^12.1.4",
 				"@types/qs": "^6.9.16",
 				"@types/react": "^17.0.75",
-				"@wordpress/browserslist-config": "^6.9.0",
+				"@wordpress/browserslist-config": "^6.10.0",
 				"eslint": "^8.57.0",
 				"lint-staged": "^15.2.10",
 				"newspack-scripts": "^5.5.2",
@@ -6162,9 +6162,9 @@
 			}
 		},
 		"node_modules/@wordpress/browserslist-config": {
-			"version": "6.9.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.9.0.tgz",
-			"integrity": "sha512-yv8KJrMZTvhY+PNWQ6CQVTUs/6sAVgim7AxGpgTkVzDYKvTeJKuZqeHzAWtHKTOG+ORIj/29XtpIOU85R9dkng==",
+			"version": "6.10.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.10.0.tgz",
+			"integrity": "sha512-X5BG4xWvr1Qq9S2x5ERCF7V4bpa24zbj8cWYbIJaGiCfi6vp6dFI1SbvuZPXfKyThyytTVYBvEIr6CSm6G8fuQ==",
 			"dev": true,
 			"engines": {
 				"node": ">=18.12.0",
diff --git a/package.json b/package.json
index b0f26c177d..7253e8a093 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 		"@testing-library/react": "^12.1.4",
 		"@types/qs": "^6.9.16",
 		"@types/react": "^17.0.75",
-		"@wordpress/browserslist-config": "^6.9.0",
+		"@wordpress/browserslist-config": "^6.10.0",
 		"eslint": "^8.57.0",
 		"lint-staged": "^15.2.10",
 		"newspack-scripts": "^5.5.2",

From e3823e7b858c356b3e5e4a490e119b94e7f12285 Mon Sep 17 00:00:00 2001
From: Rasmy Nguyen <raz@automattic.com>
Date: Mon, 21 Oct 2024 09:11:22 -0400
Subject: [PATCH 03/17] fix(site-kit): update logger cron to hourly interval
 (#3485)

---
 includes/plugins/google-site-kit/class-googlesitekit-logger.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/plugins/google-site-kit/class-googlesitekit-logger.php b/includes/plugins/google-site-kit/class-googlesitekit-logger.php
index 4c421f4868..31412e0ef1 100644
--- a/includes/plugins/google-site-kit/class-googlesitekit-logger.php
+++ b/includes/plugins/google-site-kit/class-googlesitekit-logger.php
@@ -47,7 +47,7 @@ public static function cron_init() {
 		if ( defined( 'NEWSPACK_CRON_DISABLE' ) && is_array( NEWSPACK_CRON_DISABLE ) && in_array( self::CRON_HOOK, NEWSPACK_CRON_DISABLE, true ) ) {
 			self::cron_deactivate();
 		} elseif ( ! wp_next_scheduled( self::CRON_HOOK ) ) {
-			wp_schedule_event( time(), 'daily', self::CRON_HOOK );
+			wp_schedule_event( time(), 'hourly', self::CRON_HOOK );
 		}
 	}
 

From 123408e1338491b5561b5e588d663d4184fa226b Mon Sep 17 00:00:00 2001
From: Miguel Peixe <miguel.peixe@automattic.com>
Date: Wed, 23 Oct 2024 13:51:19 -0300
Subject: [PATCH 04/17] feat(connections): jetpack sso (#3486)

---
 includes/wizards/class-connections-wizard.php |   1 +
 src/wizards/connections/views/main/index.js   |   2 +
 .../connections/views/main/jetpack-sso.js     | 149 ++++++++++++++++++
 3 files changed, 152 insertions(+)
 create mode 100644 src/wizards/connections/views/main/jetpack-sso.js

diff --git a/includes/wizards/class-connections-wizard.php b/includes/wizards/class-connections-wizard.php
index ef5ed8f0ef..c5cb4293e9 100644
--- a/includes/wizards/class-connections-wizard.php
+++ b/includes/wizards/class-connections-wizard.php
@@ -66,6 +66,7 @@ public function enqueue_scripts_and_styles() {
 				'can_connect_fivetran' => OAuth::is_proxy_configured( 'fivetran' ),
 				'can_use_webhooks'     => defined( 'NEWSPACK_EXPERIMENTAL_WEBHOOKS' ) && NEWSPACK_EXPERIMENTAL_WEBHOOKS,
 				'can_use_everlit'      => Everlit_Configuration_Manager::is_enabled(),
+				'can_use_jetpack_sso'  => class_exists( 'Jetpack' ) && defined( 'NEWSPACK_MANAGER_FILE' ),
 			]
 		);
 		\wp_enqueue_script( 'newspack-connections-wizard' );
diff --git a/src/wizards/connections/views/main/index.js b/src/wizards/connections/views/main/index.js
index f17e15b1b6..74c589a6c8 100644
--- a/src/wizards/connections/views/main/index.js
+++ b/src/wizards/connections/views/main/index.js
@@ -14,6 +14,7 @@ import Plugins from './plugins';
 import GoogleAuth from './google';
 import Mailchimp from './mailchimp';
 import FivetranConnection from './fivetran';
+import JetpackSSO from './jetpack-sso';
 import Recaptcha from './recaptcha';
 import Webhooks from './webhooks';
 
@@ -39,6 +40,7 @@ const Main = () => {
 					/>
 				</>
 			) }
+			<JetpackSSO setError={ setErrorWithPrefix( __( 'Jetpack SSO: ', 'newspack-plugin' ) ) } />
 			<Recaptcha setError={ setErrorWithPrefix( __( 'reCAPTCHA: ', 'newspack-plugin' ) ) } />
 			{ newspack_connections_data.can_use_webhooks && <Webhooks /> }
 		</>
diff --git a/src/wizards/connections/views/main/jetpack-sso.js b/src/wizards/connections/views/main/jetpack-sso.js
new file mode 100644
index 0000000000..b6c5a3198d
--- /dev/null
+++ b/src/wizards/connections/views/main/jetpack-sso.js
@@ -0,0 +1,149 @@
+/* globals newspack_connections_data */
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { BaseControl, CheckboxControl } from '@wordpress/components';
+import { useEffect, useState } from '@wordpress/element';
+import apiFetch from '@wordpress/api-fetch';
+
+/**
+ * Internal dependencies
+ */
+import {
+	ActionCard,
+	Button,
+	Grid,
+	Notice,
+	SectionHeader,
+	SelectControl,
+} from '../../../../components/src';
+
+const JetpackSSO = () => {
+	const [ error, setError ] = useState( null );
+	const [ isLoading, setIsLoading ] = useState( false );
+	const [ settings, setSettings ] = useState( {} );
+	const [ settingsToUpdate, setSettingsToUpdate ] = useState( {} );
+
+	useEffect( () => {
+		const fetchSettings = async () => {
+			setIsLoading( true );
+			try {
+				const fetchedSettings = await apiFetch( { path: '/newspack-manager/v1/jetpack-sso' } );
+				setSettings( fetchedSettings );
+				setSettingsToUpdate( fetchedSettings );
+			} catch ( e ) {
+				setError( e.message || __( 'Error fetching settings.', 'newspack-plugin' ) );
+			} finally {
+				setIsLoading( false );
+			}
+		};
+		fetchSettings();
+	}, [] );
+
+	const updateSettings = async data => {
+		setError( null );
+		setIsLoading( true );
+		try {
+			const newSettings = await apiFetch( {
+				path: '/newspack-manager/v1/jetpack-sso',
+				method: 'POST',
+				data,
+			} );
+			setSettings( newSettings );
+			setSettingsToUpdate( newSettings );
+		} catch ( e ) {
+			setError( e?.message || __( 'Error updating settings.', 'newspack-plugin' ) );
+		} finally {
+			setIsLoading( false );
+		}
+	};
+	if ( ! newspack_connections_data.can_use_jetpack_sso ) {
+		return null;
+	}
+	return (
+		<>
+			<SectionHeader id="jetpack-sso" title={ __( 'Jetpack SSO', 'newspack-plugin' ) } />
+			<ActionCard
+				isMedium
+				title={ __( 'Force two-factor authentication', 'newspack-plugin' ) }
+				description={ () => (
+					<>
+						{ __(
+							'Improve security by requiring two-factor authentication via WordPress.com for users with higher capabilities.',
+							'newspack-plugin'
+						) }
+					</>
+				) }
+				hasGreyHeader={ !! settings.force_2fa }
+				toggleChecked={ !! settings.force_2fa }
+				toggleOnChange={ () => updateSettings( { force_2fa: ! settings.force_2fa } ) }
+				actionContent={
+					settings.force_2fa && (
+						<Button
+							variant="primary"
+							disabled={ isLoading || ! Object.keys( settingsToUpdate ).length }
+							onClick={ () => updateSettings( settingsToUpdate ) }
+						>
+							{ __( 'Save Settings', 'newspack-plugin' ) }
+						</Button>
+					)
+				}
+				disabled={ isLoading }
+			>
+				{ settings.force_2fa && (
+					<>
+						{ error && <Notice isError noticeText={ error } /> }
+						{ settings.jetpack_sso_force_2fa && (
+							<>
+							<Notice
+								isError
+								noticeText={ __(
+									'Two-factor authentication is currently enforced for all users via Jetpack configuration.',
+									'newspack-plugin'
+								) }
+							/>
+							<p>
+								{ __(
+									'Customize which capabilties to enforce 2FA by untoggling the “Require accounts to use WordPress.com Two-Step Authentication” option in Jetpack settings.',
+									'newspack-plugin'
+								) }
+							</p>
+							</>
+						) }
+						<Grid columns={ 1 }>
+							<BaseControl
+								id="force-2fa-cap"
+								label={ __( 'Select the user capability to enforce two-factor authentication', 'newspack-plugin' ) }
+							>
+								<SelectControl
+									label={ __( 'Capability', 'newspack-plugin' ) }
+									hideLabelFromVision
+									value={ settingsToUpdate?.force_2fa_cap || '' }
+									onChange={ value =>
+										setSettingsToUpdate( { ...settingsToUpdate, force_2fa_cap: value } )
+									}
+									options={
+										Object.keys( settings.available_caps || {} ).map( cap => ( {
+											label: settings.available_caps[ cap ],
+											value: cap,
+										} ) )
+									}
+								/>
+							</BaseControl>
+						</Grid>
+						<Grid columns={ 1 }>
+							<CheckboxControl
+								checked={ settingsToUpdate?.obfuscate_account || false }
+								onChange={ value => setSettingsToUpdate( { ...settingsToUpdate, obfuscate_account: value } ) }
+								label={ __( 'Obfuscate restricted accounts by throwing WP’s “user not found” errors on login form attempts.', 'newspack-plugin' ) }
+							/>
+						</Grid>
+					</>
+				) }
+			</ActionCard>
+		</>
+	);
+};
+
+export default JetpackSSO;

From cd0b859fad407f5de6b840bbe2da8c596a7793a5 Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@automattic.com>
Date: Wed, 23 Oct 2024 16:20:48 -0300
Subject: [PATCH 05/17] feat: display list remote name on newsletter wizard
 (#3478)

* feat: display list remote name on newsletter wizard

* feat: restore line deleted by accident
---
 src/wizards/engagement/views/newsletters/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wizards/engagement/views/newsletters/index.js b/src/wizards/engagement/views/newsletters/index.js
index 97e1254f6f..32c614b2cc 100644
--- a/src/wizards/engagement/views/newsletters/index.js
+++ b/src/wizards/engagement/views/newsletters/index.js
@@ -352,8 +352,10 @@ export const SubscriptionLists = ( { lockedLists, onUpdate, initialProvider } )
 							isSmall
 							simple
 							hasWhiteHeader
-							title={ list.name }
-							description={ list?.type_label ? list.type_label : null }
+							title={ list.remote_name }
+							description={
+								list?.type_label ? list.type_label : null
+							}
 							disabled={ inFlight }
 							toggleOnChange={ handleChange( index, 'active' ) }
 							toggleChecked={ list.active }

From 63e8ab22674e001b27e5158afc25c83793aed824 Mon Sep 17 00:00:00 2001
From: Miguel Peixe <miguel.peixe@automattic.com>
Date: Fri, 25 Oct 2024 08:10:23 -0300
Subject: [PATCH 06/17] fix(webhooks): deprecate global endpoint (#3492)

---
 includes/data-events/class-api.php            | 17 ++--
 includes/data-events/class-webhooks.php       | 44 ++++++---
 src/components/src/modal/index.js             | 28 +++---
 .../connections/views/main/webhooks.js        | 63 ++++++------
 tests/unit-tests/webhooks.php                 | 97 +++++++++----------
 5 files changed, 131 insertions(+), 118 deletions(-)

diff --git a/includes/data-events/class-api.php b/includes/data-events/class-api.php
index 07052f6628..ba13147daa 100644
--- a/includes/data-events/class-api.php
+++ b/includes/data-events/class-api.php
@@ -102,7 +102,7 @@ public static function permission_callback() {
 		if ( ! current_user_can( 'manage_options' ) ) {
 			return new \WP_Error(
 				'newspack_rest_forbidden',
-				esc_html__( 'You cannot use this resource.', 'newspack' ),
+				esc_html__( 'You cannot use this resource.', 'newspack-plugin' ),
 				[
 					'status' => 403,
 				]
@@ -129,9 +129,6 @@ private static function get_endpoint_args() {
 					'sanitize_callback' => 'sanitize_text_field',
 				],
 			],
-			'global'       => [
-				'type' => 'boolean',
-			],
 			'disabled'     => [
 				'type' => 'boolean',
 			],
@@ -168,7 +165,7 @@ public static function test_url( $request ) {
 				[
 					'success' => false,
 					'code'    => false,
-					'message' => esc_html__( 'Invalid URL.', 'newspack' ),
+					'message' => esc_html__( 'Invalid URL.', 'newspack-plugin' ),
 				]
 			);
 		}
@@ -249,16 +246,16 @@ public static function upsert_endpoint( $request ) {
 		if ( empty( $args['url'] ) || \esc_url_raw( $args['url'], [ 'https' ] ) !== $args['url'] ) {
 			return new \WP_Error(
 				'newspack_webhooks_invalid_url',
-				esc_html__( 'Invalid URL.', 'newspack' ),
+				esc_html__( 'Invalid URL.', 'newspack-plugin' ),
 				[
 					'status' => 400,
 				]
 			);
 		}
-		if ( ! $args['global'] && empty( $args['actions'] ) ) {
+		if ( empty( $args['actions'] ) ) {
 			return new \WP_Error(
 				'newspack_webhooks_invalid_actions',
-				esc_html__( 'You must select actions to trigger this endpoint. Set it to global if this endpoint is meant for all actions.', 'newspack' ),
+				esc_html__( 'You must select actions to trigger this endpoint.', 'newspack-plugin' ),
 				[
 					'status' => 400,
 				]
@@ -267,15 +264,13 @@ public static function upsert_endpoint( $request ) {
 		if ( empty( $args['id'] ) ) {
 			$endpoint = Webhooks::create_endpoint(
 				$args['url'],
-				$args['actions'] ?? [],
-				$args['global']
+				$args['actions'] ?? []
 			);
 		} else {
 			$endpoint = Webhooks::update_endpoint(
 				$args['id'],
 				$args['url'],
 				$args['actions'] ?? [],
-				$args['global'],
 				$args['disabled']
 			);
 		}
diff --git a/includes/data-events/class-webhooks.php b/includes/data-events/class-webhooks.php
index b3a9fc21ec..dd241e4ce6 100644
--- a/includes/data-events/class-webhooks.php
+++ b/includes/data-events/class-webhooks.php
@@ -220,16 +220,38 @@ public static function send_late_requests() {
 		}
 	}
 
+	/**
+	 * Get endpoint errors.
+	 *
+	 * @param string $url     Endpoint URL.
+	 * @param array  $actions Array of action names.
+	 *
+	 * @return WP_Error
+	 */
+	private static function get_endpoint_errors( $url, $actions ) {
+		$errors = new WP_Error();
+		if ( empty( $url ) ) {
+			$errors->add( 'newspack_webhooks_invalid_url', __( 'Invalid URL.', 'newspack' ) );
+		}
+		if ( empty( $actions ) ) {
+			$errors->add( 'newspack_webhooks_empty_actions', __( 'The endpoint must have at least one action.', 'newspack' ) );
+		}
+		return $errors;
+	}
+
 	/**
 	 * Create a webhook endpoint.
 	 *
 	 * @param string $url     Endpoint URL.
 	 * @param array  $actions Array of action names.
-	 * @param bool   $global  Whether the endpoint should be triggered for all actions.
 	 *
 	 * @return array|WP_Error Endpoint or error.
 	 */
-	public static function create_endpoint( $url, $actions = [], $global = false ) {
+	public static function create_endpoint( $url, $actions ) {
+		$errors = self::get_endpoint_errors( $url, $actions );
+		if ( $errors->has_errors() ) {
+			return $errors;
+		}
 		$endpoint = \wp_insert_term(
 			$url,
 			self::ENDPOINT_TAXONOMY,
@@ -241,7 +263,6 @@ public static function create_endpoint( $url, $actions = [], $global = false ) {
 			return $endpoint;
 		}
 		\update_term_meta( $endpoint['term_id'], 'actions', $actions );
-		\update_term_meta( $endpoint['term_id'], 'global', $global );
 		return self::get_endpoint_by_term( $endpoint['term_id'] );
 	}
 
@@ -251,12 +272,11 @@ public static function create_endpoint( $url, $actions = [], $global = false ) {
 	 * @param string $id      An unique identifier for the endpoint.
 	 * @param string $url     Endpoint URL.
 	 * @param array  $actions Array of action names.
-	 * @param bool   $global  Whether the endpoint should be triggered for all actions.
 	 *
 	 * @throws \InvalidArgumentException If the ID is invalid.
 	 * @return void
 	 */
-	public static function register_system_endpoint( $id, $url, $actions = [], $global = false ) {
+	public static function register_system_endpoint( $id, $url, $actions = [] ) {
 
 		if ( ! is_string( $id ) || ctype_digit( $id ) || ! preg_match( '/^[a-z0-9-_]+$/', $id ) || ! empty( self::$system_endpoints[ $id ] ) ) {
 			throw new \InvalidArgumentException( 'Endpoint ID must be a unique string containing only lowercase letters, numbers, dashes and underscores, and it can not be only numerical.' );
@@ -266,7 +286,6 @@ public static function register_system_endpoint( $id, $url, $actions = [], $glob
 			'id'             => $id,
 			'url'            => $url,
 			'actions'        => $actions,
-			'global'         => $global,
 			'label'          => $id,
 			'disabled'       => false,
 			'disabled_error' => null,
@@ -282,12 +301,15 @@ public static function register_system_endpoint( $id, $url, $actions = [], $glob
 	 * @param int    $id       Endpoint ID.
 	 * @param string $url      Endpoint URL.
 	 * @param array  $actions  Array of action names.
-	 * @param bool   $global   Whether the endpoint should be triggered for all actions.
 	 * @param bool   $disabled Whether the endpoint is disabled.
 	 *
 	 * @return array|WP_Error Endpoint or error.
 	 */
-	public static function update_endpoint( $id, $url, $actions = [], $global = false, $disabled = false ) {
+	public static function update_endpoint( $id, $url, $actions = [], $disabled = false ) {
+		$errors = self::get_endpoint_errors( $url, $actions );
+		if ( $errors->has_errors() ) {
+			return $errors;
+		}
 		$endpoint = \get_term( $id, self::ENDPOINT_TAXONOMY, ARRAY_A );
 		if ( ! $endpoint ) {
 			return new WP_Error( 'newspack_webhooks_endpoint_not_found', __( 'Webhook endpoint not found.', 'newspack' ) );
@@ -301,7 +323,6 @@ public static function update_endpoint( $id, $url, $actions = [], $global = fals
 			]
 		);
 		\update_term_meta( $endpoint['term_id'], 'actions', $actions );
-		\update_term_meta( $endpoint['term_id'], 'global', $global );
 		\update_term_meta( $endpoint['term_id'], 'disabled', $disabled );
 		return self::get_endpoint_by_term( $endpoint['term_id'] );
 	}
@@ -387,7 +408,6 @@ public static function get_endpoint_by_term( $endpoint ) {
 			'id'             => $endpoint->term_id,
 			'url'            => $endpoint->name,
 			'actions'        => (array) \get_term_meta( $endpoint->term_id, 'actions', true ),
-			'global'         => (bool) \get_term_meta( $endpoint->term_id, 'global', true ),
 			'label'          => \get_term_meta( $endpoint->term_id, 'label', true ),
 			'bearer_token'   => \get_term_meta( $endpoint->term_id, 'bearer_token', true ),
 			'disabled'       => $disabled,
@@ -514,7 +534,7 @@ private static function get_endpoints_for_action( $action_name ) {
 			array_filter(
 				$endpoints,
 				function( $endpoint ) use ( $action_name ) {
-					return ! $endpoint['disabled'] && ( $endpoint['global'] || in_array( $action_name, $endpoint['actions'], true ) );
+					return ! $endpoint['disabled'] && in_array( $action_name, $endpoint['actions'], true );
 				}
 			)
 		);
@@ -832,7 +852,7 @@ private static function send_request( $request_id ) {
 		}
 		$code    = \wp_remote_retrieve_response_code( $response );
 		$message = \wp_remote_retrieve_response_message( $response );
-		
+
 		$response_body = wp_remote_retrieve_body( $response );
 		$response_body = json_decode( $response_body, true );
 
diff --git a/src/components/src/modal/index.js b/src/components/src/modal/index.js
index 8fa4a4350b..514db445a1 100644
--- a/src/components/src/modal/index.js
+++ b/src/components/src/modal/index.js
@@ -5,7 +5,7 @@
 /**
  * WordPress dependencies.
  */
-import { Component } from '@wordpress/element';
+import { forwardRef } from '@wordpress/element';
 import { Modal as BaseComponent } from '@wordpress/components';
 
 /**
@@ -18,21 +18,15 @@ import './style.scss';
  */
 import classnames from 'classnames';
 
-class Modal extends Component {
-	/**
-	 * Render.
-	 */
-	render() {
-		const { className, isWide, isNarrow, ...otherProps } = this.props;
-		const classes = classnames(
-			'newspack-modal',
-			isWide && 'newspack-modal--wide',
-			isNarrow && 'newspack-modal--narrow',
-			className
-		);
+function Modal( { className, isWide, isNarrow, ...otherProps }, ref ) {
+	const classes = classnames(
+		'newspack-modal',
+		isWide && 'newspack-modal--wide',
+		isNarrow && 'newspack-modal--narrow',
+		className
+	);
 
-		return <BaseComponent className={ classes } { ...otherProps } />;
-	}
-}
+	return <BaseComponent className={ classes } { ...otherProps } ref={ ref } />;
 
-export default Modal;
+}
+export default forwardRef( Modal );
diff --git a/src/wizards/connections/views/main/webhooks.js b/src/wizards/connections/views/main/webhooks.js
index 85eb777874..c37fd6e7a7 100644
--- a/src/wizards/connections/views/main/webhooks.js
+++ b/src/wizards/connections/views/main/webhooks.js
@@ -8,7 +8,7 @@ import moment from 'moment';
  */
 import { sprintf, __ } from '@wordpress/i18n';
 import { CheckboxControl, MenuItem } from '@wordpress/components';
-import { useEffect, useState } from '@wordpress/element';
+import { useEffect, useState, useRef } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 import { Icon, settings, check, close, reusableBlock, moreVertical } from '@wordpress/icons';
 import { ESCAPE } from '@wordpress/keycodes';
@@ -152,6 +152,8 @@ const Webhooks = () => {
 	const [ editing, setEditing ] = useState( false );
 	const [ editingError, setEditingError ] = useState( false );
 
+	const modalRef = useRef( null );
+
 	const fetchEndpoints = () => {
 		setInFlight( true );
 		apiFetch( { path: '/newspack/v1/webhooks/endpoints' } )
@@ -200,9 +202,27 @@ const Webhooks = () => {
 				setDeleting( false );
 			} );
 	};
+	const validateEndpoint = endpoint => {
+		const errors = [];
+		if ( ! endpoint.url ) {
+			errors.push( __( 'URL is required.', 'newspack-plugin' ) );
+		}
+		if ( ! endpoint.actions || ! endpoint.actions.length ) {
+			errors.push( __( 'At least one action is required.', 'newspack-plugin' ) );
+		}
+		if ( errors.length ) {
+			setEditingError( { message: errors.join( ' ' ) } );
+		} else {
+			setEditingError( false );
+		}
+		return errors;
+	}
 	const upsertEndpoint = endpoint => {
+		const errors = validateEndpoint( endpoint );
+		if ( errors.length ) {
+			return;
+		}
 		setInFlight( true );
-		setEditingError( false );
 		apiFetch( {
 			path: `/newspack/v1/webhooks/endpoints/${ endpoint.id || '' }`,
 			method: 'POST',
@@ -251,6 +271,12 @@ const Webhooks = () => {
 		setTestError( false );
 	}, [ editing ] );
 
+	useEffect( () => {
+		if ( editingError ) {
+			modalRef?.current?.querySelector('.components-modal__content')?.scrollTo( { top: 0, left: 0, behavior: 'smooth' } );
+		}
+	}, [ editingError ] );
+
 	return (
 		<Card noBorder className="mt64">
 			{ false !== error && <Notice isError noticeText={ error.message } /> }
@@ -266,7 +292,7 @@ const Webhooks = () => {
 				/>
 				<Button
 					variant="primary"
-					onClick={ () => setEditing( { global: true } ) }
+					onClick={ () => setEditing( {} ) }
 					disabled={ inFlight }
 				>
 					{ __( 'Add New Endpoint', 'newspack-plugin' ) }
@@ -298,17 +324,10 @@ const Webhooks = () => {
 								return (
 									<>
 										{ __( 'Actions:', 'newspack-plugin' ) }{ ' ' }
-										{ endpoint.global ? (
-											<span className="newspack-webhooks__endpoint__action">
-												{ __( 'global', 'newspack-plugin' ) }
-											</span>
-										) : (
-											endpoint.actions.map( action => (
-												<span key={ action } className="newspack-webhooks__endpoint__action">
-													{ action }
-												</span>
-											) )
-										) }
+										{ endpoint.actions.map( action => (
+											<span key={ action } className="newspack-webhooks__endpoint__action">
+												{ action }
+											</span> ) ) }
 									</>
 								);
 							} }
@@ -439,6 +458,7 @@ const Webhooks = () => {
 			) }
 			{ false !== editing && (
 				<Modal
+					ref={ modalRef }
 					title={ __( 'Webhook Endpoint', 'newspack-plugin' ) }
 					onRequestClose={ () => {
 						setEditing( false );
@@ -521,21 +541,11 @@ const Webhooks = () => {
 					/>
 					<Grid columns={ 1 } gutter={ 16 }>
 						<h3>{ __( 'Actions', 'newspack-plugin' ) }</h3>
-						<CheckboxControl
-							checked={ editing.global }
-							onChange={ value => setEditing( { ...editing, global: value } ) }
-							label={ __( 'Global', 'newspack-plugin' ) }
-							help={ __(
-								'Leave this checked if you want this endpoint to receive data from all actions.',
-								'newspack-plugin'
-							) }
-							disabled={ inFlight }
-						/>
 						{ actions.length > 0 && (
 							<>
 								<p>
 									{ __(
-										'If this endpoint is not global, select which actions should trigger this endpoint:',
+										'Select which actions should trigger this endpoint:',
 										'newspack-plugin'
 									) }
 								</p>
@@ -543,10 +553,9 @@ const Webhooks = () => {
 									{ actions.map( ( action, i ) => (
 										<CheckboxControl
 											key={ i }
-											disabled={ editing.global || inFlight }
+											disabled={ inFlight }
 											label={ action }
 											checked={ ( editing.actions && editing.actions.includes( action ) ) || false }
-											indeterminate={ editing.global }
 											onChange={ () => {
 												const currentActions = editing.actions || [];
 												if ( currentActions.includes( action ) ) {
diff --git a/tests/unit-tests/webhooks.php b/tests/unit-tests/webhooks.php
index 0dcaedcaaf..5048cf919b 100644
--- a/tests/unit-tests/webhooks.php
+++ b/tests/unit-tests/webhooks.php
@@ -11,14 +11,6 @@
  * Tests the Webhooks functionality.
  */
 class Newspack_Test_Webhooks extends WP_UnitTestCase {
-
-	/**
-	 * Global endpoint ID
-	 *
-	 * @var int
-	 */
-	private $global_endpoint;
-
 	/**
 	 * Action endpoint ID
 	 *
@@ -61,11 +53,6 @@ public function set_up() {
 		}
 
 		// Create sample endpoints.
-		$this->global_endpoint         = Data_Events\Webhooks::create_endpoint(
-			'https://example.com/webhook',
-			[],
-			true
-		)['id'];
 		$this->action_endpoint         = Data_Events\Webhooks::create_endpoint(
 			'https://example.com/webhook/test_action',
 			[ 'test_action' ]
@@ -75,12 +62,27 @@ public function set_up() {
 			[ 'missing_action' ]
 		)['id'];
 		$this->endpoints               = [
-			$this->global_endpoint,
 			$this->action_endpoint,
 			$this->missing_action_endpoint,
 		];
 	}
 
+	/**
+	 * Teardown.
+	 */
+	public function tear_down() {
+		// Remove all endpoints.
+		$terms = get_terms(
+			[
+				'taxonomy'   => Data_Events\Webhooks::ENDPOINT_TAXONOMY,
+				'hide_empty' => false,
+			]
+		);
+		foreach ( $terms as $term ) {
+			wp_delete_term( $term->term_id, Data_Events\Webhooks::ENDPOINT_TAXONOMY );
+		}
+	}
+
 	/**
 	 * Dispatch a sample data event.
 	 *
@@ -96,23 +98,30 @@ private function dispatch_event( $action_name = 'test_action', $data = [ 'test'
 	 * Test creating an endpoint.
 	 */
 	public function test_create_endpoint() {
-		$id        = $this->global_endpoint;
+		$id        = $this->action_endpoint;
 		$endpoints = Data_Events\Webhooks::get_endpoints();
 		foreach ( $endpoints as $endpoint ) {
 			if ( $endpoint['id'] === $id ) {
-				$this->assertEquals( 'https://example.com/webhook', $endpoint['url'] );
-				$this->assertEquals( [], $endpoint['actions'] );
-				$this->assertEquals( true, $endpoint['global'] );
+				$this->assertEquals( 'https://example.com/webhook/test_action', $endpoint['url'] );
+				$this->assertEquals( [ 'test_action' ], $endpoint['actions'] );
 				$this->assertEquals( false, $endpoint['disabled'] );
 			}
 		}
 	}
 
+	/**
+	 * Test create endpoint with empty actions.
+	 */
+	public function test_create_endpoint_empty_actions() {
+		$result = Data_Events\Webhooks::create_endpoint( 'https://example.com/webhook/empty_actions', [] );
+		$this->assertTrue( is_wp_error( $result ) );
+	}
+
 	/**
 	 * Test updating an endpoint label.
 	 */
 	public function test_update_endpoint_label() {
-		$id = $this->global_endpoint;
+		$id = $this->action_endpoint;
 		Data_Events\Webhooks::update_endpoint_label( $id, 'Test Label' );
 		$endpoints = Data_Events\Webhooks::get_endpoints();
 		foreach ( $endpoints as $endpoint ) {
@@ -137,19 +146,9 @@ public function test_delete_endpoint() {
 	 * Test disabling an endpoint.
 	 */
 	public function test_disable_endpoint() {
-		Data_Events\Webhooks::disable_endpoint( $this->global_endpoint );
-		$endpoints = Data_Events\Webhooks::get_endpoints();
-		$this->assertEquals( true, $endpoints[0]['disabled'] );
-	}
-
-	/**
-	 * Test that dispatching an action creates webhook requests for a global
-	 * endpoint.
-	 */
-	public function test_dispatch_create_request() {
-		$this->dispatch_event();
-		$requests = Data_Events\Webhooks::get_endpoint_requests( $this->global_endpoint );
-		$this->assertEquals( 1, count( $requests ) );
+		Data_Events\Webhooks::disable_endpoint( $this->action_endpoint );
+		$endpoint = Data_Events\Webhooks::get_endpoint( $this->action_endpoint );
+		$this->assertEquals( true, $endpoint['disabled'] );
 	}
 
 	/**
@@ -176,9 +175,9 @@ public function test_missing_action_endpoint() {
 	 * Test that a disabled endpoint doesn't create webhook requests.
 	 */
 	public function test_disabled_endpoints() {
-		Data_Events\Webhooks::disable_endpoint( $this->global_endpoint );
+		Data_Events\Webhooks::disable_endpoint( $this->action_endpoint );
 		$this->dispatch_event();
-		$requests = Data_Events\Webhooks::get_endpoint_requests( $this->global_endpoint );
+		$requests = Data_Events\Webhooks::get_endpoint_requests( $this->action_endpoint );
 		$this->assertEquals( 0, count( $requests ) );
 	}
 
@@ -187,7 +186,7 @@ public function test_disabled_endpoints() {
 	 */
 	public function test_request_scheduling() {
 		$this->dispatch_event();
-		$requests = Data_Events\Webhooks::get_endpoint_requests( $this->global_endpoint );
+		$requests = Data_Events\Webhooks::get_endpoint_requests( $this->action_endpoint );
 		$post     = get_post( $requests[0]['id'] );
 		$this->assertEquals( 'future', $post->post_status );
 		$this->assertGreaterThan( time(), strtotime( $post->post_date ) );
@@ -215,9 +214,9 @@ function( $preempt, $args, $url ) use ( &$http_args, &$http_url ) {
 			10,
 			3
 		);
-		$request_id = Data_Events\Webhooks::get_endpoint_requests( $this->global_endpoint )[0]['id'];
+		$request_id = Data_Events\Webhooks::get_endpoint_requests( $this->action_endpoint )[0]['id'];
 		wp_publish_post( $request_id );
-		$this->assertEquals( 'https://example.com/webhook', $http_url );
+		$this->assertEquals( 'https://example.com/webhook/test_action', $http_url );
 		$this->assertEquals( 'POST', $http_args['method'] );
 		$this->assertEquals( 'application/json', $http_args['headers']['Content-Type'] );
 		$this->assertEquals( get_post_meta( $request_id, 'body', true ), $http_args['body'] );
@@ -239,7 +238,7 @@ function() {
 				];
 			}
 		);
-		$request_id = Data_Events\Webhooks::get_endpoint_requests( $this->global_endpoint )[0]['id'];
+		$request_id = Data_Events\Webhooks::get_endpoint_requests( $this->action_endpoint )[0]['id'];
 		wp_publish_post( $request_id );
 		$this->assertEquals( 'future', get_post_status( $request_id ) );
 		$this->assertGreaterThan( time(), strtotime( get_post( $request_id )->post_date ) );
@@ -266,7 +265,7 @@ function() {
 			}
 		);
 
-		$request_id = Data_Events\Webhooks::get_endpoint_requests( $this->global_endpoint )[0]['id'];
+		$request_id = Data_Events\Webhooks::get_endpoint_requests( $this->action_endpoint )[0]['id'];
 
 		while ( $retries <= $max_retries ) {
 			wp_publish_post( $request_id );
@@ -278,8 +277,8 @@ function() {
 			$retries++;
 		}
 
-		$endpoints = Data_Events\Webhooks::get_endpoints();
-		$this->assertTrue( $endpoints[0]['disabled'] );
+		$endpoint = Data_Events\Webhooks::get_endpoint( $this->action_endpoint );
+		$this->assertTrue( $endpoint['disabled'] );
 	}
 
 	/**
@@ -348,10 +347,10 @@ function() {
 	public function test_system_endpoint() {
 		Data_Events\Webhooks::register_system_endpoint( 'test', 'https://example.com/test' );
 		$endpoints = Data_Events\Webhooks::get_endpoints();
-		$this->assertSame( 4, count( $endpoints ) );
-		$this->assertSame( 'test', $endpoints[3]['id'] );
-		$this->assertTrue( $endpoints[3]['system'] );
-		$this->assertFalse( $endpoints[2]['system'] );
+		$this->assertSame( 3, count( $endpoints ) );
+		$this->assertSame( 'test', $endpoints[2]['id'] );
+		$this->assertTrue( $endpoints[2]['system'] );
+		$this->assertFalse( $endpoints[1]['system'] );
 
 		$ep = Data_Events\Webhooks::get_endpoint( 'test' );
 		$this->assertSame( 'test', $ep['id'] );
@@ -362,18 +361,14 @@ public function test_system_endpoint() {
 	 * Tests that getting endpoint requests fetch requests for system endpoints.
 	 */
 	public function test_get_endpoint_requests() {
-		Data_Events\Webhooks::register_system_endpoint( 'test-2', 'https://example.com/test', [], true );
-		Data_Events\Webhooks::register_system_endpoint( 'test-3', 'https://example2.com/test', [ 'test_action' ] );
+		Data_Events\Webhooks::register_system_endpoint( 'test-2', 'https://example2.com/test', [ 'test_action' ] );
 		$this->dispatch_event();
 
-		$requests = Data_Events\Webhooks::get_endpoint_requests( $this->global_endpoint );
+		$requests = Data_Events\Webhooks::get_endpoint_requests( $this->action_endpoint );
 		$this->assertSame( 1, count( $requests ) );
 
 		$requests = Data_Events\Webhooks::get_endpoint_requests( 'test-2' );
 		$this->assertSame( 1, count( $requests ) );
-
-		$requests = Data_Events\Webhooks::get_endpoint_requests( 'test-3' );
-		$this->assertSame( 1, count( $requests ) );
 	}
 
 	/**

From 5312d30ba56d9f105d2548bc0dd6430b215cf877 Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@automattic.com>
Date: Fri, 25 Oct 2024 10:24:27 -0300
Subject: [PATCH 07/17] feat: add user name to woocommerce data events (#3473)

* feat: add user name to woocommerce data events

* fix: use correct object
---
 includes/data-events/class-utils.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/includes/data-events/class-utils.php b/includes/data-events/class-utils.php
index 86e1febb8f..fdf1d85379 100644
--- a/includes/data-events/class-utils.php
+++ b/includes/data-events/class-utils.php
@@ -63,6 +63,8 @@ public static function get_order_data( $order_id, $process_donations_only = fals
 				'product_id' => $product_id,
 				'client_id'  => $order->get_meta( NEWSPACK_CLIENT_ID_COOKIE_NAME ),
 			],
+			'user_first_name' => $order->get_billing_first_name(),
+			'user_last_name'  => $order->get_billing_last_name(),
 		];
 	}
 
@@ -85,6 +87,8 @@ public static function get_recurring_donation_data( $subscription ) {
 			'currency'        => $subscription->get_currency(),
 			'recurrence'      => empty( $recurrence ) ? 'once' : $recurrence,
 			'platform'        => \Newspack\Donations::get_platform_slug(),
+			'user_first_name' => $subscription->get_billing_first_name(),
+			'user_last_name'  => $subscription->get_billing_last_name(),
 		];
 	}
 }

From e089172f75ccf7bd16e641a257ddcf29687c6a9f Mon Sep 17 00:00:00 2001
From: Rasmy Nguyen <raz@automattic.com>
Date: Sun, 27 Oct 2024 10:18:05 -0400
Subject: [PATCH 08/17] fix: php fatal and warning (#3502)

Fixes a fatal and a notice that appears for php 8.3.
---
 includes/class-newspack-image-credits.php |  5 +++--
 includes/wizards/class-setup-wizard.php   | 14 ++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/includes/class-newspack-image-credits.php b/includes/class-newspack-image-credits.php
index ddd22fbdf2..739dfb4eee 100644
--- a/includes/class-newspack-image-credits.php
+++ b/includes/class-newspack-image-credits.php
@@ -421,7 +421,8 @@ function( $setting ) use ( $key ) {
 					return $setting['key'] === $key;
 				}
 			);
-			return reset( array_values( $setting ) );
+			$setting_values = array_values( $setting );
+			return reset( $setting_values );
 		}
 
 		return $default_settings;
@@ -560,7 +561,7 @@ public static function populate_credit( $metadata, $attachment_id, $context ) {
 	 */
 	public static function register_meta() {
 		foreach ( [
-			static::MEDIA_CREDIT_META, 
+			static::MEDIA_CREDIT_META,
 			static::MEDIA_CREDIT_URL_META,
 			static::MEDIA_CREDIT_ORG_META,
 			static::MEDIA_CREDIT_CAN_DISTRIBUTE_META,
diff --git a/includes/wizards/class-setup-wizard.php b/includes/wizards/class-setup-wizard.php
index ac29fb8e3d..61416892bd 100644
--- a/includes/wizards/class-setup-wizard.php
+++ b/includes/wizards/class-setup-wizard.php
@@ -325,12 +325,14 @@ public function api_retrieve_theme_and_set_defaults() {
 			}
 		}
 		$theme_mods['theme_colors'] = get_theme_mod( 'theme_colors', 'default' );
-		if ( 'default' === $theme_mods['theme_colors'] ) {
-			$theme_mods['primary_color_hex']   = newspack_get_primary_color();
-			$theme_mods['secondary_color_hex'] = newspack_get_secondary_color();
-		} else {
-			$theme_mods['primary_color_hex']   = get_theme_mod( 'primary_color_hex', newspack_get_primary_color() );
-			$theme_mods['secondary_color_hex'] = get_theme_mod( 'secondary_color_hex', newspack_get_secondary_color() );
+		if ( function_exists( '\newspack_get_primary_color' ) ) {
+			if ( 'default' === $theme_mods['theme_colors'] ) {
+				$theme_mods['primary_color_hex']   = \newspack_get_primary_color();
+				$theme_mods['secondary_color_hex'] = \newspack_get_secondary_color();
+			} else {
+				$theme_mods['primary_color_hex']   = get_theme_mod( 'primary_color_hex', \newspack_get_primary_color() );
+				$theme_mods['secondary_color_hex'] = get_theme_mod( 'secondary_color_hex', \newspack_get_secondary_color() );
+			}
 		}
 
 		// Set custom header color to primary, if not set.

From 9a81584e5771ea15d2d9e3e96a9d782ec9936f26 Mon Sep 17 00:00:00 2001
From: Adam Cassis <adam.cassis@automattic.com>
Date: Fri, 25 Oct 2024 13:32:48 +0200
Subject: [PATCH 09/17] fix(co-authors-plus): CLI for migrating from CAP GA

---
 includes/cli/class-co-authors-plus.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/cli/class-co-authors-plus.php b/includes/cli/class-co-authors-plus.php
index 06932ef81a..82d1493543 100644
--- a/includes/cli/class-co-authors-plus.php
+++ b/includes/cli/class-co-authors-plus.php
@@ -161,7 +161,7 @@ public function backfill_non_editing_contributor( $args, $assoc_args ) {
 		$users = get_users(
 			[
 				'role__in'     => [ 'subscriber', 'customer' ],
-				'role__not_in' => [ \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME, 'administrator', 'editor', 'author', 'contributor' ],
+				'role__not_in' => [ \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME, 'administrator', 'editor', 'author', 'contributor' ],
 				'fields'       => 'ID',
 				'number'       => -1,
 			]
@@ -170,7 +170,7 @@ public function backfill_non_editing_contributor( $args, $assoc_args ) {
 			if ( count_user_posts( $user_id ) > 0 ) { // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.count_user_posts_count_user_posts
 				if ( self::$live ) {
 					WP_CLI::line( sprintf( 'Will add the Non-Editing Contributor role to user %d.', $user_id ) );
-					get_user_by( 'id', $user_id )->add_role( \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
+					get_user_by( 'id', $user_id )->add_role( \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
 				} else {
 					WP_CLI::line( sprintf( 'Would add the Non-Editing Contributor role to user %d.', $user_id ) );
 				}
@@ -266,7 +266,7 @@ function( $value ) {
 				'user_nicename'   => isset( $post_meta['cap-user_login'] ) ? $post_meta['cap-user_login'] : '',
 				'user_url'        => isset( $post_meta['cap-website'] ) ? $post_meta['cap-website'] : '',
 				'user_pass'       => wp_generate_password(),
-				'role'            => \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME,
+				'role'            => \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME,
 				'display_name'    => isset( $post_meta['cap-display_name'] ) ? $post_meta['cap-display_name'] : '',
 				'first_name'      => isset( $post_meta['cap-first_name'] ) ? $post_meta['cap-first_name'] : '',
 				'last_name'       => isset( $post_meta['cap-last_name'] ) ? $post_meta['cap-last_name'] : '',
@@ -420,7 +420,7 @@ private static function migrate_linked_guest_authors() {
 			self::assign_user_meta( $guest_author, $user_id );
 
 			// Add the Non-Editing Contributor role.
-			$linked_user->add_role( \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
+			$linked_user->add_role( \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
 		}
 	}
 

From d38fc1aa18f0571b2a48d1ead128347f10dce57b Mon Sep 17 00:00:00 2001
From: Derrick Koo <dkoo@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:20:06 -0600
Subject: [PATCH 10/17] fix: avoid duplicate info notices in email editors
 (#3512)

---
 src/other-scripts/emails/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/other-scripts/emails/index.js b/src/other-scripts/emails/index.js
index 47435efe7b..53f0c601f9 100644
--- a/src/other-scripts/emails/index.js
+++ b/src/other-scripts/emails/index.js
@@ -49,6 +49,7 @@ const ReaderRevenueEmailSidebar = compose( [
 	useEffect( () => {
 		if ( config?.editor_notice ) {
 			createNotice( 'info', config.editor_notice, {
+				id: 'newspack_email_info',
 				isDismissible: false,
 			} );
 		}
@@ -61,6 +62,7 @@ const ReaderRevenueEmailSidebar = compose( [
 				config.from_email || newspack_emails.from_email
 			),
 			{
+				id: 'newspack_email_sender',
 				isDismissible: false,
 			}
 		);

From b0c0e3b4806305e69b4f42e6dd5190f19a94aa6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 09:38:11 +0000
Subject: [PATCH 11/17] chore(deps-dev): bump @wordpress/browserslist-config

Bumps [@wordpress/browserslist-config](https://github.com/WordPress/gutenberg/tree/HEAD/packages/browserslist-config) from 6.10.0 to 6.11.0.
- [Release notes](https://github.com/WordPress/gutenberg/releases)
- [Changelog](https://github.com/WordPress/gutenberg/blob/trunk/packages/browserslist-config/CHANGELOG.md)
- [Commits](https://github.com/WordPress/gutenberg/commits/@wordpress/browserslist-config@6.11.0/packages/browserslist-config)

---
updated-dependencies:
- dependency-name: "@wordpress/browserslist-config"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8ff18032ab..21d668c683 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
 				"@testing-library/react": "^12.1.4",
 				"@types/qs": "^6.9.16",
 				"@types/react": "^17.0.75",
-				"@wordpress/browserslist-config": "^6.10.0",
+				"@wordpress/browserslist-config": "^6.11.0",
 				"eslint": "^8.57.0",
 				"lint-staged": "^15.2.10",
 				"newspack-scripts": "^5.5.2",
@@ -6162,9 +6162,9 @@
 			}
 		},
 		"node_modules/@wordpress/browserslist-config": {
-			"version": "6.10.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.10.0.tgz",
-			"integrity": "sha512-X5BG4xWvr1Qq9S2x5ERCF7V4bpa24zbj8cWYbIJaGiCfi6vp6dFI1SbvuZPXfKyThyytTVYBvEIr6CSm6G8fuQ==",
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.11.0.tgz",
+			"integrity": "sha512-wUDbJ3x7c8iMZLtwo+7VlWZ/vDc47PDW2eSAKW18RrQBSTdaNmWi4qiyFYi7Ye2XkyfUd2gp71MTJjZi6n/V2A==",
 			"dev": true,
 			"engines": {
 				"node": ">=18.12.0",
diff --git a/package.json b/package.json
index f48754934d..ce1116b943 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 		"@testing-library/react": "^12.1.4",
 		"@types/qs": "^6.9.16",
 		"@types/react": "^17.0.75",
-		"@wordpress/browserslist-config": "^6.10.0",
+		"@wordpress/browserslist-config": "^6.11.0",
 		"eslint": "^8.57.0",
 		"lint-staged": "^15.2.10",
 		"newspack-scripts": "^5.5.2",

From 90aee4600ccd9e4b444f85feb6a5514c002653ee Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@automattic.com>
Date: Mon, 4 Nov 2024 15:48:49 -0300
Subject: [PATCH 12/17] docs: add new woo events params (#3499)

---
 includes/data-events/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/includes/data-events/README.md b/includes/data-events/README.md
index b78ab0234f..9d171fd2c4 100644
--- a/includes/data-events/README.md
+++ b/includes/data-events/README.md
@@ -91,6 +91,8 @@ For when there's a new donation processed through WooCommerce.
 | `is_renewal`      | `bool`   | If this is a subscription renewal (recurring payment)  |
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` | The Woocommerce customer billing first name            |
+| `user_last_name`  | `string` | The Woocommerce customer billing last name             |
 
 ### `woocommerce_order_failed`
 
@@ -111,6 +113,8 @@ the order is already marked as failed so this hook will not trigger.
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `popup_id`        | `string` | If the donation was triggered by a popup, the popup ID |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` | The Woocommerce customer billing first name            |
+| `user_last_name`  | `string` | The Woocommerce customer billing last name             |
 
 ### `donation_new`
 
@@ -129,6 +133,8 @@ When there's a new donation.
 | `is_renewal`      | `bool`   | If this is a subscription renewal (recurring payment)  |
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` |                                                        |
+| `user_last_name`  | `string` |                                                        |
 
 ### `order_completed`
 
@@ -146,6 +152,8 @@ When any WooCommerce order is completed with a successful payment.
 | `is_renewal`      | `bool`   | If this is a subscription renewal (recurring payment)  |
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` |                                                        |
+| `user_last_name`  | `string` |                                                        |
 
 ### `donation_subscription_new`
 
@@ -162,6 +170,8 @@ When there's a new WooCommerce Subscription. This action does not replace the `d
 | `platform`        | `string` |                                                        |
 | `referer`         | `string` |                                                        |
 | `popup_id`        | `string` | If the donation was triggered by a popup, the popup ID |
+| `user_first_name` | `string` |                                                        |
+| `user_last_name`  | `string` |                                                        |
 
 ### `donation_subscription_cancelled`
 
@@ -176,6 +186,8 @@ When a WooCommerce Subscription is cancelled.
 | `currency`        | `string` |
 | `recurrence`      | `string` |
 | `platform`        | `string` |
+| `user_first_name` | `string` |
+| `user_last_name`  | `string` |
 
 ### `donation_subscription_changed`
 
@@ -192,6 +204,8 @@ When a WooCommerce Subscription status changes.
 | `currency`        | `string` |
 | `recurrence`      | `string` |
 | `platform`        | `string` |
+| `user_first_name` | `string` |
+| `user_last_name`  | `string` |
 
 ### `product_subscription_changed`
 
@@ -207,6 +221,8 @@ When a non-donation subscription status changes.
 | `recurrence`      | `string` |
 | `status_before`   | `string` |
 | `status_after`    | `string` |
+| `user_first_name` | `string` |
+| `user_last_name`  | `string` |
 
 ## Membership Actions
 

From d889162994f12cbd138b590e44fcedbc34d09373 Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@automattic.com>
Date: Mon, 4 Nov 2024 15:49:18 -0300
Subject: [PATCH 13/17] chore: add workflow for changelog label (#3516)

---
 .github/labeler.yml             |  2 ++
 .github/workflows/changelog.yml | 36 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/changelog.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 0000000000..60b9b8cd4a
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,2 @@
+needs-changelog:
+ - base-branch: ['trunk']
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 0000000000..de6cdb7aab
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,36 @@
+name: "Pull Request Labeler"
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  labeler:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
+
+  comment_pr:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    name: Comment about the change log label
+    steps:
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          message: |
+            Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:
+
+            Now, the `needs-changelog` label has been added to it.
+
+            Please check if this PR needs to be included in the "Upcoming Changes" and "Release Notes" doc. If it doesn't, simply remove the label.
+
+            If it does, please add an entry to it to our shared document, with screenshots and testing instructions if applicable, then remove the label.
+
+            Thank you! :heart:

From 2e05fd4a9e82c995be2a4d354112d41326017d38 Mon Sep 17 00:00:00 2001
From: Derrick Koo <dkoo@users.noreply.github.com>
Date: Mon, 4 Nov 2024 13:37:49 -0700
Subject: [PATCH 14/17] fix: command to fix active subs w/ missing next_payment
 dates (#3484)

* fix: command to fix active subs w/ missing next_payment dates

* fix: don't process pending-cancel subs

* fix: check for billing period + interval, and account for in-progress

* fix: skip broken subscriptions

* Update includes/reader-revenue/woocommerce/class-woocommerce-cli.php

Co-authored-by: Adam Cassis <adam@adamcassis.com>

* fix: account for successful orders and end dates

* test: add unit tests

* test: minor assertion improvements

* Update tests/unit-tests/woocommerce-cli.php

Co-authored-by: Adam Cassis <adam@adamcassis.com>

* test: update assertions with human-readable messages

* refactor: rename method for clarity

---------

Co-authored-by: Adam Cassis <adam@adamcassis.com>
---
 .../woocommerce/class-woocommerce-cli.php     | 184 +++++++++++++++++
 tests/mocks/wc-mocks.php                      |  82 ++++++++
 tests/unit-tests/woocommerce-cli.php          | 185 ++++++++++++++++++
 3 files changed, 451 insertions(+)
 create mode 100644 tests/unit-tests/woocommerce-cli.php

diff --git a/includes/reader-revenue/woocommerce/class-woocommerce-cli.php b/includes/reader-revenue/woocommerce/class-woocommerce-cli.php
index ae11ecbb7b..1317e574d3 100644
--- a/includes/reader-revenue/woocommerce/class-woocommerce-cli.php
+++ b/includes/reader-revenue/woocommerce/class-woocommerce-cli.php
@@ -162,6 +162,190 @@ function( $subscription ) {
 		}
 	}
 
+	/**
+	 * Fixes or reports active subscriptions that have missed next payment dates.
+	 * By default, will only process subscriptions started in the past 90 days.
+	 *
+	 * ## OPTIONS
+	 *
+	 * [--dry-run]
+	 * : If set, will report results but will not make any changes.
+	 *
+	 * [--batch-size=<batch-size>]
+	 * : The number of subscriptions to process in each batch. Default: 50.
+	 *
+	 * [--start-date=<date-string>]
+	 * : A date string in YYYY-MM-DD format to use as the start date for the script. Default: 90 days ago.
+	 *
+	 * @param array $args Positional args.
+	 * @param array $assoc_args Associative args.
+	 */
+	public function fix_missing_next_payment_dates( $args, $assoc_args ) {
+		$dry_run    = ! empty( $assoc_args['dry-run'] );
+		$now        = time();
+		$batch_size = ! empty( $assoc_args['batch-size'] ) ? intval( $assoc_args['batch-size'] ) : 50;
+		$start_date = ! empty( $assoc_args['start-date'] ) ? strtotime( $assoc_args['start-date'] ) : strtotime( '-90 days', $now );
+
+		if ( ! $dry_run ) {
+			\WP_CLI::line( "\n=====================\n=     LIVE MODE     =\n=====================\n" );
+		} else {
+			\WP_CLI::line( "\n===================\n=     DRY RUN     =\n===================\n" );
+		}
+		sleep( 2 );
+
+		\WP_CLI::log(
+			'
+Fetching active subscriptions with missing or missed next_payment dates...
+		'
+		);
+
+		$query_args    = [
+			'subscriptions_per_page' => $batch_size,
+			'subscription_status'    => [ 'active', 'pending' ],
+			'offset'                 => 0,
+		];
+		$processed     = 0;
+		$subscriptions = \wcs_get_subscriptions( $query_args );
+		$total_revenue = 0;
+		$results       = [];
+
+		while ( ! empty( $subscriptions ) ) {
+			foreach ( $subscriptions as $subscription_id => $subscription ) {
+				array_shift( $subscriptions );
+
+				// If the subscription start date is before the $args start date, we're done.
+				if ( strtotime( $subscription->get_date( 'start' ) ) < $start_date ) {
+					$subscriptions = [];
+					break;
+				}
+
+				$result = self::validate_subscription_dates( $subscription, $dry_run );
+				if ( ! $result ) {
+					continue;
+				}
+
+				if ( $result['missed_periods'] ) {
+					$total_revenue += $result['missed_total'];
+				}
+
+				$results[] = $result;
+				$processed++;
+
+				// Get the next batch.
+				if ( empty( $subscriptions ) ) {
+					$query_args['offset'] += $batch_size;
+					$subscriptions        = \wcs_get_subscriptions( $query_args );
+				}
+			}
+		}
+
+		if ( empty( $results ) ) {
+			\WP_CLI::log( 'No subscriptions with missing next_payment dates found in the given time period.' );
+		} else {
+			\WP_CLI\Utils\format_items(
+				'table',
+				$results,
+				[
+					'ID',
+					'status',
+					'start_date',
+					'next_payment_date',
+					'end_date',
+					'billing_period',
+					'missed_periods',
+					'missed_total',
+				]
+			);
+			\WP_CLI::success(
+				sprintf(
+					'Finished processing %d subscriptions. %s',
+					$processed,
+					$total_revenue ? 'Total missed revenue: ' . \wp_strip_all_tags( html_entity_decode( \wc_price( $total_revenue ) ) ) : ''
+				)
+			);
+		}
+		\WP_CLI::line( '' );
+	}
+
+	/**
+	 * Validate renewal date for the given subscription, accounting for end date.
+	 * If missing, calculates the next_payment date and reports missed payments
+	 * since the last successful order or subscription start.
+	 *
+	 * @param WC_Subscription $subscription The subscription.
+	 * @param bool            $dry_run If set, will not make any changes.
+	 *
+	 * @return array|false The result array or false if the subscription is broken.
+	 */
+	public static function validate_subscription_dates( $subscription, $dry_run = false ) {
+		$now                = time();
+		$subscription_start = $subscription->get_date( 'start' );
+		$next_payment_date  = $subscription->get_date( 'next_payment' );
+		$is_in_past         = ! strtotime( $next_payment_date ) || strtotime( $next_payment_date ) < $now;
+
+		// Subscription has a valid next payment date and it's in the future, so skip.
+		if ( $next_payment_date && ! $is_in_past ) {
+			return false;
+		}
+
+		$result = [
+			'ID'                => $subscription->get_id(),
+			'status'            => $subscription->get_status(),
+			'start_date'        => $subscription_start,
+			'next_payment_date' => $next_payment_date,
+			'end_date'          => $subscription->get_date( 'end' ),
+			'billing_period'    => $subscription->get_billing_period(),
+			'billing_interval'  => $subscription->get_billing_interval(),
+			'missed_periods'    => 0,
+			'missed_total'      => 0,
+		];
+
+		// Can't process a broken subscription (missing a billing period or interval).
+		if ( empty( $result['billing_period'] ) || empty( $result['billing_interval'] ) ) {
+			return false;
+		}
+
+		$period   = $result['billing_period'];
+		$interval = (int) $result['billing_interval'];
+		$min_date = strtotime( "+$interval $period", strtotime( $subscription_start ) ); // Start after first period so we don't count in-progress periods as missed.
+		$end_date = $now;
+
+		// If there were successful orders for this subscription, start from the last one.
+		$last_order = $subscription->get_last_order( 'all', 'any', [ 'pending', 'processing', 'on-hold', 'cancelled', 'refunded', 'failed' ] );
+		if ( $last_order && $last_order->get_date_completed() ) {
+			$min_date = strtotime( "+$interval $period", $last_order->get_date_completed()->getOffsetTimestamp() );
+		}
+
+		// If there's an end date, end there.
+		if ( ! empty( $result['end_date'] ) ) {
+			$end_date = strtotime( $result['end_date'] );
+		}
+
+		while ( $min_date <= $end_date ) {
+			$result['missed_periods']++;
+			$min_date = strtotime( "+$interval $period", $min_date );
+		}
+
+		if ( $result['missed_periods'] ) {
+			$result['missed_total'] += $subscription->get_total() * $result['missed_periods'];
+		}
+
+		$calculated_next_payment = $subscription->calculate_date( 'next_payment' );
+		if ( ! $result['end_date'] || strtotime( $result['end_date'] ) > strtotime( $calculated_next_payment ) ) {
+			$result['next_payment_date'] = $calculated_next_payment;
+			if ( ! $dry_run ) {
+				$subscription->update_dates(
+					[
+						'next_payment' => $calculated_next_payment,
+					]
+				);
+				$subscription->save();
+			}
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Outputs a list of subscription in CLI
 	 *
diff --git a/tests/mocks/wc-mocks.php b/tests/mocks/wc-mocks.php
index 119a6921af..e09c466675 100644
--- a/tests/mocks/wc-mocks.php
+++ b/tests/mocks/wc-mocks.php
@@ -40,6 +40,9 @@ class WC_DateTime extends DateTime {
 	public function date( $format ) {
 		return gmdate( $format, $this->getTimestamp() );
 	}
+	public function getOffsetTimestamp() {
+		return $this->getTimestamp() + $this->getOffset();
+	}
 }
 
 class WC_Customer {
@@ -112,12 +115,91 @@ public function get_items() {
 	public function get_date_paid() {
 		return new WC_DateTime( $this->data['date_paid'] );
 	}
+	public function get_date_completed() {
+		return new WC_DateTime( $this->data['date_completed'] );
+	}
+	public function get_total() {
+		return $this->data['total'];
+	}
+	public function get_status() {
+		return $this->data['status'];
+	}
+}
+
+class WC_Subscription {
+	public $data = [];
+	public $meta = [];
+	public $orders = [];
+	public function __construct( $data ) {
+		$this->data = array_merge( $data, $this->data );
+		if ( isset( $data['meta'] ) ) {
+			$this->meta = $data['meta'];
+		}
+		if ( isset( $data['orders'] ) ) {
+			$this->orders = $data['orders'];
+			usort(
+				$this->orders,
+				function( $a, $b ) {
+					return $b->get_date_paid()->getTimestamp() <=> $a->get_date_paid()->getTimestamp();
+				}
+			);
+		}
+	}
+	public function get_id() {
+		return $this->data['id'];
+	}
+	public function get_customer_id() {
+		return $this->data['customer_id'];
+	}
+	public function get_meta( $field_name ) {
+		return isset( $this->meta[ $field_name ] ) ? $this->meta[ $field_name ] : '';
+	}
+	public function has_status( $statuses ) {
+		return in_array( $this->data['status'], $statuses );
+	}
+	public function get_date_paid() {
+		return new WC_DateTime( $this->data['date_paid'] );
+	}
 	public function get_total() {
 		return $this->data['total'];
 	}
 	public function get_status() {
 		return $this->data['status'];
 	}
+	public function get_billing_period() {
+		return $this->data['billing_period'];
+	}
+	public function get_billing_interval() {
+		return $this->data['billing_interval'];
+	}
+	public function get_last_order() {
+		if ( ! empty( $this->orders ) ) {
+			return end( $this->orders );
+		}
+		return false;
+	}
+	public function get_date( $type ) {
+		return $this->data['dates'][ $type ] ?? 0;
+	}
+	public function calculate_date() {
+		$start    = strtotime( $this->get_date( 'start' ) );
+		$interval = $this->get_billing_interval();
+		$period   = $this->get_billing_period();
+		$end      = time();
+
+		while ( $start <= $end ) {
+			$start = strtotime( "+$interval $period", $start );
+		}
+		return gmdate( 'Y-m-d H:i:s', $start );
+	}
+	public function update_dates( $dates ) {
+		foreach ( $dates as $type => $date ) {
+			$this->data['dates'][ $type ] = $date;
+		}
+	}
+	public function save() {
+		return true;
+	}
 }
 
 function wc_create_order( $data ) {
diff --git a/tests/unit-tests/woocommerce-cli.php b/tests/unit-tests/woocommerce-cli.php
new file mode 100644
index 0000000000..5acc26e56f
--- /dev/null
+++ b/tests/unit-tests/woocommerce-cli.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Tests CLI scripts for WooComerce.
+ *
+ * @package Newspack\Tests
+ */
+
+use Newspack\WooCommerce_Cli;
+
+/**
+ * Tests the Webhooks functionality.
+ */
+class Newspack_Test_WooCommerce_Cli extends WP_UnitTestCase {
+	/**
+	 * A user to assign test subscriptions/orders.
+	 *
+	 * @var int
+	 */
+	private static $user_id = null;
+
+	/**
+	 * Set up before class.
+	 */
+	public static function set_up_before_class() { // phpcs:ignore Squiz.Commenting.FunctionComment.Missing
+		self::$user_id = wp_insert_user(
+			[
+				'user_login' => 'test_user',
+				'user_email' => 'test@example.com',
+				'user_pass'  => 'password',
+				'meta_input' => [
+					'first_name'     => 'John',
+					'last_name'      => 'Doe',
+					'wc_total_spent' => 100,
+				],
+			]
+		);
+	}
+
+	/**
+	 * Test a healthy subscription that has a future next_payment date.
+	 */
+	public function test_healthy_subscription() {
+		$subscription = new WC_Subscription(
+			[
+				'id'               => 1,
+				'status'           => 'active',
+				'billing_period'   => 'month',
+				'billing_interval' => 1,
+				'total'            => 10, // Amount of recurring payment.
+				'dates'            => [
+					'start'        => gmdate( 'Y-m-d H:i:s', strtotime( '-6 month' ) ),
+					'next_payment' => gmdate( 'Y-m-d H:i:s', strtotime( '+10 day' ) ),
+				],
+				'orders'           => [
+					wc_create_order(
+						[
+							'customer_id'    => self::$user_id,
+							'status'         => 'completed',
+							'total'          => 10,
+							'date_completed' => gmdate( 'Y-m-d H:i:s', strtotime( '-1 month' ) ),
+						]
+					),
+				],
+			]
+		);
+		$result = WooCommerce_Cli::validate_subscription_dates( $subscription );
+		$this->assertFalse( $result, 'Healthy subscription wasn’t processed.' );
+	}
+
+	/**
+	 * Test a subscription that's missing a next payment date and has no successful orders.
+	 */
+	public function test_missing_next_payment_date() {
+		$subscription = new WC_Subscription(
+			[
+				'id'               => 2,
+				'status'           => 'active',
+				'billing_period'   => 'month',
+				'billing_interval' => 1,
+				'total'            => 10, // Amount of recurring payment.
+				'dates'            => [
+					'start' => gmdate( 'Y-m-d H:i:s', strtotime( '-6 month' ) ),
+				],
+			]
+		);
+		$result = WooCommerce_Cli::validate_subscription_dates( $subscription );
+		$this->assertEquals(
+			$result,
+			[
+				'ID'                => $subscription->get_id(),
+				'status'            => $subscription->get_status(),
+				'start_date'        => $subscription->get_date( 'start' ),
+				'next_payment_date' => $subscription->calculate_date( 'next_payment' ),
+				'end_date'          => $subscription->get_date( 'end' ),
+				'billing_period'    => $subscription->get_billing_period(),
+				'billing_interval'  => $subscription->get_billing_interval(),
+				'missed_periods'    => 6,
+				'missed_total'      => 60,
+			],
+			'Subscription was processed.'
+		);
+		$this->assertGreaterThan( time(), strtotime( $subscription->get_date( 'next_payment' ) ), 'Next payment date is now in the future.' );
+	}
+
+	/**
+	 * Test a subscription that's missing a next payment date but has a successful order.
+	 */
+	public function test_missing_next_payment_date_with_order() {
+		$subscription = new WC_Subscription(
+			[
+				'id'               => 3,
+				'status'           => 'active',
+				'billing_period'   => 'month',
+				'billing_interval' => 1,
+				'total'            => 10, // Amount of recurring payment.
+				'dates'            => [
+					'start' => gmdate( 'Y-m-d H:i:s', strtotime( '-6 month' ) ),
+				],
+				'orders'           => [
+					wc_create_order(
+						[
+							'customer_id'    => self::$user_id,
+							'status'         => 'completed',
+							'total'          => 10,
+							'date_completed' => gmdate( 'Y-m-d H:i:s', strtotime( '-3 month' ) ),
+						]
+					),
+				],
+			]
+		);
+		$result = WooCommerce_Cli::validate_subscription_dates( $subscription );
+		$this->assertEquals(
+			$result,
+			[
+				'ID'                => $subscription->get_id(),
+				'status'            => $subscription->get_status(),
+				'start_date'        => $subscription->get_date( 'start' ),
+				'next_payment_date' => $subscription->calculate_date( 'next_payment' ),
+				'end_date'          => $subscription->get_date( 'end' ),
+				'billing_period'    => $subscription->get_billing_period(),
+				'billing_interval'  => $subscription->get_billing_interval(),
+				'missed_periods'    => 3,
+				'missed_total'      => 30,
+			],
+			'Subscription was processed.'
+		);
+		$this->assertGreaterThan( time(), strtotime( $subscription->get_date( 'next_payment' ) ), 'Next payment date is now in the future.' );
+	}
+
+	/**
+	 * Test a subscription that's missing a next payment date but has an end date before the calculated next payment date.
+	 */
+	public function test_missing_next_payment_date_with_end_date() {
+		$subscription = new WC_Subscription(
+			[
+				'id'               => 4,
+				'status'           => 'active',
+				'billing_period'   => 'month',
+				'billing_interval' => 1,
+				'total'            => 10, // Amount of recurring payment.
+				'dates'            => [
+					'start' => gmdate( 'Y-m-d H:i:s', strtotime( '-6 month' ) ),
+					'end'   => gmdate( 'Y-m-d H:i:s', strtotime( '+3 day' ) ),
+				],
+			]
+		);
+		$result = WooCommerce_Cli::validate_subscription_dates( $subscription );
+		$this->assertEquals(
+			$result,
+			[
+				'ID'                => $subscription->get_id(),
+				'status'            => $subscription->get_status(),
+				'start_date'        => $subscription->get_date( 'start' ),
+				'next_payment_date' => 0,
+				'end_date'          => $subscription->get_date( 'end' ),
+				'billing_period'    => $subscription->get_billing_period(),
+				'billing_interval'  => $subscription->get_billing_interval(),
+				'missed_periods'    => 6,
+				'missed_total'      => 60,
+			],
+			'Subscription was processed.'
+		);
+		$this->assertEmpty( $subscription->get_date( 'next_payment' ), 'Next payment date not set because the end date will occur first.' );
+	}
+}

From d0db6ba6500b140c672e544b8ea04c5e92bebfca Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@automattic.com>
Date: Tue, 5 Nov 2024 09:32:52 -0300
Subject: [PATCH 15/17] feat: automatically disable guest authors (#3345)

* feat: automatically disable guest authors

* feat: check again the presence of gas on cron

* Update includes/plugins/co-authors-plus/class-guest-contributor-role.php

Co-authored-by: Adam Cassis <adam@adamcassis.com>

---------

Co-authored-by: Adam Cassis <adam@adamcassis.com>
---
 .../class-guest-contributor-role.php          | 74 +++++++++++++++++--
 1 file changed, 68 insertions(+), 6 deletions(-)

diff --git a/includes/plugins/co-authors-plus/class-guest-contributor-role.php b/includes/plugins/co-authors-plus/class-guest-contributor-role.php
index eb8cdcde0b..79d57ec3ad 100644
--- a/includes/plugins/co-authors-plus/class-guest-contributor-role.php
+++ b/includes/plugins/co-authors-plus/class-guest-contributor-role.php
@@ -20,6 +20,8 @@
  *
  * This role can also be assigned to users who have other roles, so they can be assigned as co-authors of a post without having the capability to edit posts.
  * This is done via a custom UI in the user profile.
+ *
+ * CAP's Guest Authors feature will be disabled by default if there are no Guest Authors in the site. If you want to force enabling it, add the NEWSPACK_ENABLE_CAP_GUEST_AUTHORS constant to your wp-config.php file.
  */
 class Guest_Contributor_Role {
 	/**
@@ -38,19 +40,21 @@ class Guest_Contributor_Role {
 	 */
 	const SETTINGS_VERSION_OPTION_NAME = 'newspack_coauthors_plus_settings_version';
 
+	/**
+	 * The option where we store if the site has CAP's guest authors.
+	 */
+	const SITE_HAS_GUEST_AUTHORS_OPTION_NAME = 'newspack_check_site_has_cap_guest_authors';
+
 	/**
 	 * Initialize hooks and filters.
 	 */
-	public static function init() {
+	public static function initialize() {
 		add_filter( 'coauthors_edit_author_cap', [ __CLASS__, 'coauthors_edit_author_cap' ] );
 		add_action( 'admin_init', [ __CLASS__, 'setup_custom_role_and_capability' ] );
 		add_action( 'template_redirect', [ __CLASS__, 'prevent_myaccount_update' ] );
 		add_action( 'newspack_before_delete_account', [ __CLASS__, 'before_delete_account' ] );
 
-		if ( defined( 'NEWSPACK_DISABLE_CAP_GUEST_AUTHORS' ) && NEWSPACK_DISABLE_CAP_GUEST_AUTHORS ) {
-			add_filter( 'coauthors_guest_authors_enabled', '__return_false' );
-			add_action( 'admin_menu', [ __CLASS__, 'guest_author_menu_replacement' ] );
-		}
+		add_action( 'init', [ __CLASS__, 'early_init' ], 5 );
 
 		// Do not allow guest authors to login.
 		\add_filter( 'wp_authenticate_user', [ __CLASS__, 'wp_authenticate_user' ], 10, 2 );
@@ -79,6 +83,64 @@ public static function init() {
 
 		// Hide author email on the frontend, if it's a placeholder email.
 		\add_filter( 'theme_mod_show_author_email', [ __CLASS__, 'should_display_author_email' ] );
+
+		// Make sure we check again if the site has guest authors every hour.
+		$re_check_guest_authors = 'newspack_re_check_guest_authors';
+		if ( ! \wp_next_scheduled( $re_check_guest_authors ) ) {
+			\wp_schedule_event( time(), 'hourly', $re_check_guest_authors );
+		}
+		add_action( $re_check_guest_authors, [ __CLASS__, 'clear_site_has_cap_guest_authors_check' ] );
+	}
+
+	/**
+	 * Runs early in the init hook to make sure it runs before Co-Authors Plus initialization.
+	 *
+	 * @return void
+	 */
+	public static function early_init() {
+		if ( defined( 'NEWSPACK_ENABLE_CAP_GUEST_AUTHORS' ) && NEWSPACK_ENABLE_CAP_GUEST_AUTHORS ) {
+			return;
+		}
+		if ( ! self::site_has_cap_guest_authors() ) {
+			add_filter( 'coauthors_guest_authors_enabled', '__return_false' );
+			add_action( 'admin_menu', [ __CLASS__, 'guest_author_menu_replacement' ] );
+		}
+	}
+
+	/**
+	 * Clear the option that stores if the site has CAP's guest authors.
+	 * This will enforce a new check in the next request.
+	 * This will make sure we update the option if all guest authors are deleted.
+	 */
+	public static function clear_site_has_cap_guest_authors_check() {
+		if ( self::site_has_cap_guest_authors() ) {
+			delete_option( self::SITE_HAS_GUEST_AUTHORS_OPTION_NAME );
+		}
+	}
+
+	/**
+	 * Checks if the site has any guest authors. Will check it once in the database and store the result in an option.
+	 *
+	 * @return bool
+	 */
+	private static function site_has_cap_guest_authors() {
+		$response = get_option( self::SITE_HAS_GUEST_AUTHORS_OPTION_NAME );
+
+		// Only check in the database once.
+		if ( false === $response ) {
+			$query = new \WP_Query(
+				[
+					'post_type'      => 'guest-author',
+					'posts_per_page' => 1,
+					'post_status'    => 'any',
+					'fields'         => 'ids',
+				]
+			);
+			$response = $query->have_posts() ? 'yes' : 'no';
+			add_option( self::SITE_HAS_GUEST_AUTHORS_OPTION_NAME, $response, '', true );
+		}
+
+		return 'yes' === $response;
 	}
 
 	/**
@@ -488,4 +550,4 @@ public static function should_display_author_email( $value ) {
 		return $value;
 	}
 }
-Guest_Contributor_Role::init();
+Guest_Contributor_Role::initialize();

From 831756e23c74357c88b9eb0a8d40007b7835f0cc Mon Sep 17 00:00:00 2001
From: Rasmy Nguyen <raz@automattic.com>
Date: Wed, 6 Nov 2024 12:06:54 -0500
Subject: [PATCH 16/17] fix(wp-6.7): update radio control styles (#3518)

This PR updates the styles for our radio control component to avoid conflicts with WP 6.7 radio control updates.
---
 src/components/src/radio-control/style.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/src/radio-control/style.scss b/src/components/src/radio-control/style.scss
index 001ce61a52..332a7b7c59 100644
--- a/src/components/src/radio-control/style.scss
+++ b/src/components/src/radio-control/style.scss
@@ -43,12 +43,15 @@
 
 	input[type="radio"] {
 		height: 24px;
-		margin-right: 8px;
 		width: 24px;
+		max-height: 24px;
+		max-width: 24px;
 
 		@media screen and ( min-width: 782px ) {
 			height: 20px;
 			width: 20px;
+			max-height: 20px;
+			max-width: 20px;
 		}
 
 		&:checked {

From 89144ffea30c49ef79b0089311bcf9b9435ce5c4 Mon Sep 17 00:00:00 2001
From: Derrick Koo <dkoo@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:06:30 -0700
Subject: [PATCH 17/17] chore: bump Newspack Components package version (#3528)

---
 src/components/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/package.json b/src/components/package.json
index ae349280e1..e90b4ff511 100644
--- a/src/components/package.json
+++ b/src/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "newspack-components",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"description": "Newspack design system components",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
@@ -58,4 +58,4 @@
 		"prepublishOnly": "npm run clean && npm run compile && node copy-styles.js",
 		"postpublish": "npm run clean"
 	}
-}
\ No newline at end of file
+}