Skip to content

Commit ebc9501

Browse files
manzoorwanijkmatticbot
manzoorwanijk
authored and
matticbot
committed
Connection: Update connection webhooks to pass skip_pricing to authorization URL (#44603)
Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/16718483259 Upstream-Ref: Automattic/jetpack@0f9cb06
1 parent 92a5f25 commit ebc9501

7 files changed

Lines changed: 121 additions & 112 deletions

File tree

‎jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
1212
### Added
1313
- Connection: extended get_option so it can work with external storage.
1414

15+
### Changed
16+
- Updated connection webhooks to pass skip_pricing to authorization URL.
17+
1518
## [6.16.2] - 2025-07-30
1619
### Fixed
1720
- Fix doc types for methods in the connection Manager class. [#44493]

‎jetpack_vendor/automattic/jetpack-connection/src/class-webhooks.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ public function handle_connect_url_redirect() {
176176
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- no site changes.
177177
$from = ! empty( $_GET['from'] ) ? sanitize_text_field( wp_unslash( $_GET['from'] ) ) : 'iframe';
178178

179+
$skip_pricing = filter_input( INPUT_GET, 'skip_pricing', FILTER_VALIDATE_BOOLEAN );
180+
179181
// phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- no site changes, sanitization happens in get_authorization_url()
180182
$redirect = ! empty( $_GET['redirect_after_auth'] ) ? wp_unslash( $_GET['redirect_after_auth'] ) : false;
181183

@@ -188,6 +190,10 @@ public function handle_connect_url_redirect() {
188190

189191
$connect_url = add_query_arg( 'from', $from, $this->connection->get_authorization_url( null, $redirect ) );
190192

193+
if ( $skip_pricing ) {
194+
$connect_url = add_query_arg( 'skip_pricing', '1', $connect_url );
195+
}
196+
191197
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- no site changes.
192198
if ( isset( $_GET['notes_iframe'] ) ) {
193199
$connect_url .= '&notes_iframe';

‎jetpack_vendor/i18n-map.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
),
2727
'jetpack-connection' => array(
2828
'path' => 'jetpack_vendor/automattic/jetpack-connection',
29-
'ver' => '6.17.0-alpha1753966628',
29+
'ver' => '6.17.0-alpha1754297358',
3030
),
3131
'jetpack-explat' => array(
3232
'path' => 'jetpack_vendor/automattic/jetpack-explat',

‎vendor/composer/installed.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dist": {
88
"type": "path",
99
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
10-
"reference": "c1de6278eb2bc98d2834a5a20b87e017a10828f8"
10+
"reference": "db638cb3af15149f43e36468a42e5e9cf57d8c25"
1111
},
1212
"require": {
1313
"php": ">=7.2"
@@ -64,7 +64,7 @@
6464
"dist": {
6565
"type": "path",
6666
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
67-
"reference": "7151e4d5cb9d2ba0a61ba8d758da2e70f010fd65"
67+
"reference": "97bb5e1ab54d4c7ec07890f9903a312ad147847e"
6868
},
6969
"require": {
7070
"php": ">=7.2"
@@ -127,7 +127,7 @@
127127
"dist": {
128128
"type": "path",
129129
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
130-
"reference": "b5554e10c85759f91eb8ee70458a0a4fee28dbc8"
130+
"reference": "b2f6beedf10191bab91384556fa40fe9e3812b96"
131131
},
132132
"require": {
133133
"automattic/jetpack-constants": "^3.0.8",
@@ -201,7 +201,7 @@
201201
"dist": {
202202
"type": "path",
203203
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
204-
"reference": "197eae2de264c4865193682b75f3007d668b095f"
204+
"reference": "fcd59d953b4e2ae820030fd6618b7c672296c57d"
205205
},
206206
"require": {
207207
"composer-plugin-api": "^2.2",
@@ -273,7 +273,7 @@
273273
"dist": {
274274
"type": "path",
275275
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
276-
"reference": "f0239e64652c3ad67acdb467fab4f05de562854f"
276+
"reference": "58dc1875fc7a43b94a665263f6a93c4fd745f557"
277277
},
278278
"require": {
279279
"automattic/jetpack-connection": "^6.17.0-alpha",
@@ -332,7 +332,7 @@
332332
"dist": {
333333
"type": "path",
334334
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
335-
"reference": "bda0dbb5fd0ee4d80d48771bcb9667133325947a"
335+
"reference": "9d1a8e0b14b11f71e0772fb9fe24151421ec484c"
336336
},
337337
"require": {
338338
"automattic/jetpack-boost-core": "^0.3.12-alpha",
@@ -400,7 +400,7 @@
400400
"dist": {
401401
"type": "path",
402402
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
403-
"reference": "c3d923923de776f52f2bfa3e6302133f0f122d59"
403+
"reference": "cdff50b3a5ffae99587be5419d1a27c9344110d1"
404404
},
405405
"require": {
406406
"composer-plugin-api": "^2.2",
@@ -464,7 +464,7 @@
464464
"dist": {
465465
"type": "path",
466466
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
467-
"reference": "b01977c8e3215a06cd9e54dab5eb59136c1e7c26"
467+
"reference": "e1c2ec62f002feee4b57ba917bb1e9eb5fd07e3c"
468468
},
469469
"require": {
470470
"php": ">=7.2"
@@ -534,12 +534,12 @@
534534
},
535535
{
536536
"name": "automattic/jetpack-connection",
537-
"version": "6.17.0-alpha.1753966628",
538-
"version_normalized": "6.17.0.0-alpha1753966628",
537+
"version": "6.17.0-alpha.1754297358",
538+
"version_normalized": "6.17.0.0-alpha1754297358",
539539
"dist": {
540540
"type": "path",
541541
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
542-
"reference": "33dc90eb1fd8110fd6296aa7051b05da1f4364d2"
542+
"reference": "0cf24518b82e9885931fedc909c3049c948938ad"
543543
},
544544
"require": {
545545
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -627,7 +627,7 @@
627627
"dist": {
628628
"type": "path",
629629
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
630-
"reference": "67f4f11fdebb5f8c7c8a5acc8131fb3ce184e94b"
630+
"reference": "71a87e9bca5191f1e6a9995cd7a2206b36faa6c0"
631631
},
632632
"require": {
633633
"php": ">=7.2"
@@ -685,7 +685,7 @@
685685
"dist": {
686686
"type": "path",
687687
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
688-
"reference": "09f59176bcce0b401874122f0dfe0947a5bce553"
688+
"reference": "1ba1c50e42a8cc2600b8472bc9e7262680734fd5"
689689
},
690690
"require": {
691691
"php": ">=7.2"
@@ -742,7 +742,7 @@
742742
"dist": {
743743
"type": "path",
744744
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
745-
"reference": "9ad16dcbd5492ec3bab2e4d8991377fe9ec05b68"
745+
"reference": "0467438253940054a255dce550b67052e8424e5c"
746746
},
747747
"require": {
748748
"automattic/jetpack-connection": "^6.17.0-alpha",
@@ -821,7 +821,7 @@
821821
"dist": {
822822
"type": "path",
823823
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
824-
"reference": "d29a69c5687cdeec9bec99976662ac77df0d786a"
824+
"reference": "30247daadecc29b3feb20dce90a722c9048723c5"
825825
},
826826
"require": {
827827
"php": ">=7.2"
@@ -883,7 +883,7 @@
883883
"dist": {
884884
"type": "path",
885885
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
886-
"reference": "95f4cde8061e7e0d3c166cb125b28a5bd20f0dc2"
886+
"reference": "2411aba201fe7481ecadc0e1cadc9627af9971d1"
887887
},
888888
"require": {
889889
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -962,7 +962,7 @@
962962
"dist": {
963963
"type": "path",
964964
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
965-
"reference": "cbe9660e568253b8283b42b9ad8930086d240450"
965+
"reference": "8f52bec65b32ca95e048b06fad08d4706738ad8b"
966966
},
967967
"require": {
968968
"automattic/jetpack-connection": "^6.17.0-alpha",
@@ -1022,7 +1022,7 @@
10221022
"dist": {
10231023
"type": "path",
10241024
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
1025-
"reference": "b02675384bc69fb8ab9464d4f3f98f24c682528d"
1025+
"reference": "e9101b3083877b8b3fff811c1fdcadcb8b2eba48"
10261026
},
10271027
"require": {
10281028
"php": ">=7.2"
@@ -1079,7 +1079,7 @@
10791079
"dist": {
10801080
"type": "path",
10811081
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
1082-
"reference": "49f9a76d76eee8977ee8c3ba1d7e096e3732ea1d"
1082+
"reference": "c2b1d4c422cc0f3965259fac0c09100e3c935011"
10831083
},
10841084
"require": {
10851085
"automattic/jetpack-admin-ui": "^0.5.11-alpha",
@@ -1179,7 +1179,7 @@
11791179
"dist": {
11801180
"type": "path",
11811181
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
1182-
"reference": "6c3d4f5933319dfe05ae0c78fb045c3a34665f78"
1182+
"reference": "a94a7f634c1b03f21a51ede3b6bc73ac01cc5d53"
11831183
},
11841184
"require": {
11851185
"php": ">=7.2"
@@ -1238,7 +1238,7 @@
12381238
"dist": {
12391239
"type": "path",
12401240
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
1241-
"reference": "537306ab54b4f1a68b5af221db9d6ff00d4f1055"
1241+
"reference": "fb05e4be509968f7819ddb76503c7edd350162f9"
12421242
},
12431243
"require": {
12441244
"automattic/jetpack-connection": "^6.17.0-alpha",
@@ -1304,7 +1304,7 @@
13041304
"dist": {
13051305
"type": "path",
13061306
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
1307-
"reference": "eee53d99c561d142e18a3cd185cf95cd37ad5ba9"
1307+
"reference": "cbbfd5ded50564481b2fb1826c720c9498745963"
13081308
},
13091309
"require": {
13101310
"automattic/jetpack-a8c-mc-stats": "^3.0.5",
@@ -1364,7 +1364,7 @@
13641364
"dist": {
13651365
"type": "path",
13661366
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
1367-
"reference": "f2ed82193785350e5c7165210b72ea8b71c460f5"
1367+
"reference": "243725bd5f251640b2a0843b302c149c93b188e3"
13681368
},
13691369
"require": {
13701370
"automattic/jetpack-redirect": "^3.0.8",
@@ -1433,7 +1433,7 @@
14331433
"dist": {
14341434
"type": "path",
14351435
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
1436-
"reference": "377b117acb6994b87f59aa9f0aeba887670fcffe"
1436+
"reference": "c549c6bd9a3ce664041fe748b17511e87ff21bf4"
14371437
},
14381438
"require": {
14391439
"automattic/jetpack-connection": "^6.17.0-alpha",
@@ -1506,7 +1506,7 @@
15061506
"dist": {
15071507
"type": "path",
15081508
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
1509-
"reference": "b1b0683fd1ff1880ffb2d36fbdf1858ee9ea1a4d"
1509+
"reference": "d1388f16e79c29dc8e21b1179c1b959302751083"
15101510
},
15111511
"require": {
15121512
"automattic/jetpack-status": "^6.0.1-alpha",
@@ -1565,7 +1565,7 @@
15651565
"dist": {
15661566
"type": "path",
15671567
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
1568-
"reference": "e8c950c0fc24a42f90eed174090a5587bba7edb1"
1568+
"reference": "f81c9eb05d28c458b8098bf8b6cf646f5b0f7781"
15691569
},
15701570
"require": {
15711571
"php": ">=7.2"
@@ -1623,7 +1623,7 @@
16231623
"dist": {
16241624
"type": "path",
16251625
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
1626-
"reference": "ce75ab9568b26f4037759d0c5c928300cb699caf"
1626+
"reference": "83f1404e4ad98af87787139a29da07bd84cd35a4"
16271627
},
16281628
"require": {
16291629
"automattic/jetpack-assets": "^4.3.2-alpha",
@@ -1709,7 +1709,7 @@
17091709
"dist": {
17101710
"type": "path",
17111711
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
1712-
"reference": "48ddf2f2450b8acc480374d4027b73380ba085d3"
1712+
"reference": "0289e69a17945d8070525d39601ff349d04d1812"
17131713
},
17141714
"require": {
17151715
"automattic/jetpack-connection": "^6.17.0-alpha",
@@ -1779,7 +1779,7 @@
17791779
"dist": {
17801780
"type": "path",
17811781
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
1782-
"reference": "2b989a12e0b5d37df9e62b0261142b3beb0688d9"
1782+
"reference": "d98524b873268a28612c93820975b912c1b47a18"
17831783
},
17841784
"require": {
17851785
"automattic/jetpack-constants": "^3.0.8",
@@ -1847,7 +1847,7 @@
18471847
"dist": {
18481848
"type": "path",
18491849
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
1850-
"reference": "543911a821d38ab05a468d50e736157fefd5db66"
1850+
"reference": "1e84650cc66a8f65646aca74d7c93dae5e6fcc6b"
18511851
},
18521852
"require": {
18531853
"automattic/jetpack-connection": "^6.17.0-alpha",

0 commit comments

Comments
 (0)