@automattic/jetpack-connection 0.30.12 → 0.31.0

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## [0.31.0] - 2024-01-18
+### Changed
+- Allow using blog ID instead of site suffix in checkout URL. [#34976]
+
 ## [0.30.12] - 2024-01-04
 ### Changed
 - Updated package dependencies. [#34815] [#34816]
@@ -680,6 +684,7 @@
 - `Main` and `ConnectUser` components added.
 - `JetpackRestApiClient` API client added.
 
+[0.31.0]: https://github.com/Automattic/jetpack-connection-js/compare/v0.30.12...v0.31.0
 [0.30.12]: https://github.com/Automattic/jetpack-connection-js/compare/v0.30.11...v0.30.12
 [0.30.11]: https://github.com/Automattic/jetpack-connection-js/compare/v0.30.10...v0.30.11
 [0.30.10]: https://github.com/Automattic/jetpack-connection-js/compare/v0.30.9...v0.30.10

package/hooks/use-product-checkout-workflow/index.jsx

@@ -1,6 +1,6 @@
 import restApi from '@automattic/jetpack-api';
 import { getCalypsoOrigin } from '@automattic/jetpack-connection';
-import { useDispatch } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 import debugFactory from 'debug';
 import { useEffect, useState, useMemo } from 'react';
 import useConnection from '../../components/use-connection';
@@ -30,6 +30,7 @@ const defaultAdminUrl =
  * @param {Function} props.siteProductAvailabilityHandler - The function used to check whether the site already has the requested product. This will be checked after registration and the checkout page will be skipped if the promise returned resloves true.
  * @param {Function} props.from                           - The plugin slug initiated the flow.
  * @param {number} [props.quantity]                       - The quantity of the product to purchase.
+ * @param {boolean} [props.useBlogIdSuffix]               - Use blog ID instead of site suffix in the checkout URL.
  * @returns {Function}                                      The useEffect hook.
  */
 export default function useProductCheckoutWorkflow( {
@@ -41,6 +42,7 @@ export default function useProductCheckoutWorkflow( {
 	siteProductAvailabilityHandler = null,
 	quantity = null,
 	from,
+	useBlogIdSuffix = false,
 } = {} ) {
 	debug( 'productSlug is %s', productSlug );
 	debug( 'redirectUrl is %s', redirectUrl );
@@ -49,6 +51,11 @@ export default function useProductCheckoutWorkflow( {
 	const [ hasCheckoutStarted, setCheckoutStarted ] = useState( false );
 	const { registerSite } = useDispatch( STORE_ID );
 
+	const blogID = useSelect( select => select( STORE_ID ).getBlogId(), [ STORE_ID ] );
+	debug( 'blogID is %s', blogID ?? 'undefined' );
+
+	useBlogIdSuffix = useBlogIdSuffix && !! blogID;
+
 	const { isUserConnected, isRegistered, handleConnectUser } = useConnection( {
 		redirectUri: redirectUrl,
 		from,
@@ -61,7 +68,7 @@ export default function useProductCheckoutWorkflow( {
 
 		const checkoutPath = shouldConnectAfterCheckout
 			? 'checkout/jetpack/'
-			: `checkout/${ siteSuffix }/`;
+			: `checkout/${ useBlogIdSuffix ? blogID.toString() : siteSuffix }/`;
 
 		const quantitySuffix = quantity != null ? `:-q-${ quantity }` : '';
 
@@ -102,6 +109,8 @@ export default function useProductCheckoutWorkflow( {
 		from,
 		redirectUrl,
 		adminUrl,
+		useBlogIdSuffix,
+		blogID,
 	] );
 
 	debug( 'isRegistered is %s', isRegistered );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.30.12",
+	"version": "0.31.0",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {
@@ -16,7 +16,7 @@
 	"dependencies": {
 		"@automattic/jetpack-analytics": "^0.1.29",
 		"@automattic/jetpack-api": "^0.16.8",
-		"@automattic/jetpack-components": "^0.45.10",
+		"@automattic/jetpack-components": "^0.46.0",
 		"@automattic/jetpack-config": "^0.1.24",
 		"@wordpress/base-styles": "4.39.0",
 		"@wordpress/browserslist-config": "5.31.0",