@automattic/jetpack-connection 1.3.1 → 1.4.0

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## [1.4.0] - 2025-08-04
+### Added
+- Add "from" argument to user connection url. [#44587]
+
+### Changed
+- My Jetpack: Unify the user connection flow with a unified screen. [#44469]
+
+## [1.3.2] - 2025-07-30
+### Changed
+- Update dependencies.
+
 ## [1.3.1] - 2025-07-28
 ### Changed
 - Internal updates.
@@ -1116,6 +1127,8 @@
 - `Main` and `ConnectUser` components added.
 - `JetpackRestApiClient` API client added.
 
+[1.4.0]: https://github.com/Automattic/jetpack-connection-js/compare/v1.3.2...v1.4.0
+[1.3.2]: https://github.com/Automattic/jetpack-connection-js/compare/v1.3.1...v1.3.2
 [1.3.1]: https://github.com/Automattic/jetpack-connection-js/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/Automattic/jetpack-connection-js/compare/v1.2.14...v1.3.0
 [1.2.14]: https://github.com/Automattic/jetpack-connection-js/compare/v1.2.13...v1.2.14

package/helpers/get-user-connection-url.ts

@@ -0,0 +1,45 @@
+import { getJetpackAdminPageUrl, getMyJetpackUrl } from '@automattic/jetpack-script-data';
+import { addQueryArgs } from '@wordpress/url';
+
+export type UserConnectionUrlOptions = {
+	/**
+	 * The URL to redirect to after authentication.
+	 *
+	 * Defaults to the My Jetpack URL if not provided.
+	 */
+	redirect_url?: string | null;
+
+	/**
+	 * The `from` to pass to Calypso for identification.
+	 *
+	 * This is typically used to identify the source of the connection request.
+	 * If not provided, defaults to 'my-jetpack'.
+	 */
+	from?: string | null;
+
+	/**
+	 * Whether to skip the pricing page after authentication.
+	 *
+	 * @default true
+	 */
+	skip_pricing?: boolean;
+};
+
+/**
+ * Generates the user connection URL.
+ *
+ * @param options - Options for generating the user connection URL.
+ *
+ * @return The URL for user connection.
+ */
+export function getUserConnectionUrl( options: UserConnectionUrlOptions = {} ): string {
+	const { redirect_url, from, skip_pricing = true } = options;
+
+	return addQueryArgs( getJetpackAdminPageUrl(), {
+		// 'connect_url_redirect' is handled in \Automattic\Jetpack\Connection\Webhooks::controller()
+		connect_url_redirect: 1,
+		redirect_after_auth: redirect_url ?? getMyJetpackUrl(),
+		from: from ?? 'my-jetpack',
+		skip_pricing,
+	} );
+}

package/hooks/use-restore-connection/index.jsx

@@ -2,6 +2,7 @@ import restApi from '@automattic/jetpack-api';
 import { getScriptData } from '@automattic/jetpack-script-data';
 import { useDispatch } from '@wordpress/data';
 import { useEffect, useState } from 'react';
+import { getUserConnectionUrl } from '../../helpers/get-user-connection-url';
 import { STORE_ID } from '../../state/store';
 
 const { apiRoot, apiNonce } =
@@ -19,7 +20,7 @@ export default function useRestoreConnection() {
 
 	const { disconnectUserSuccess, setConnectionErrors } = useDispatch( STORE_ID );
 
-	const USER_CONNECTION_URL = '/wp-admin/admin.php?page=my-jetpack#/connection';
+	const USER_CONNECTION_URL = getUserConnectionUrl();
 
 	/**
 	 * Initiate connection restore.

package/index.jsx

@@ -38,6 +38,7 @@ export { default as ManageConnectionDialog } from './components/manage-connectio
  */
 export { default as thirdPartyCookiesFallbackHelper } from './helpers/third-party-cookies-fallback';
 export { default as getCalypsoOrigin } from './helpers/get-calypso-origin';
+export * from './helpers/get-user-connection-url.ts';
 
 /**
  * Store

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "1.3.1",
+	"version": "1.4.0",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {
@@ -11,14 +11,27 @@
 		"url": "https://github.com/Automattic/jetpack.git",
 		"directory": "projects/js-packages/connection"
 	},
-	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
+	"author": "Automattic",
+	"sideEffects": [
+		"./state/store.jsx",
+		"*.css",
+		"*.scss"
+	],
+	"type": "module",
+	"exports": {
+		".": "./index.jsx"
+	},
+	"scripts": {
+		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
+		"test-coverage": "pnpm run test --coverage"
+	},
 	"dependencies": {
-		"@automattic/jetpack-analytics": "^1.0.3",
-		"@automattic/jetpack-api": "^1.0.5",
-		"@automattic/jetpack-components": "^1.1.15",
-		"@automattic/jetpack-config": "^1.0.3",
-		"@automattic/jetpack-script-data": "^0.5.0",
+		"@automattic/jetpack-analytics": "^1.0.4",
+		"@automattic/jetpack-api": "^1.0.6",
+		"@automattic/jetpack-components": "^1.1.17",
+		"@automattic/jetpack-config": "^1.0.4",
+		"@automattic/jetpack-script-data": "^0.5.1",
 		"@wordpress/base-styles": "6.2.0",
 		"@wordpress/browserslist-config": "6.26.0",
 		"@wordpress/components": "29.12.0",
@@ -26,6 +39,7 @@
 		"@wordpress/element": "6.26.0",
 		"@wordpress/i18n": "5.26.0",
 		"@wordpress/icons": "10.26.0",
+		"@wordpress/url": "4.26.0",
 		"clsx": "2.1.1",
 		"debug": "4.4.1",
 		"prop-types": "^15.7.2"
@@ -47,18 +61,5 @@
 	"peerDependencies": {
 		"react": "^18.0.0",
 		"react-dom": "^18.0.0"
-	},
-	"type": "module",
-	"exports": {
-		".": "./index.jsx"
-	},
-	"sideEffects": [
-		"./state/store.jsx",
-		"*.css",
-		"*.scss"
-	],
-	"scripts": {
-		"test": "NODE_OPTIONS=--experimental-vm-modules jest",
-		"test-coverage": "pnpm run test --coverage"
 	}
 }