VideoPress: fix upgrade flow (#33708)

* use Current_Plan to return from has_required_plan * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6598456654
Automattic · Oct 21, 2023 · 1389cf2 · 1389cf2
1 parent 7df453b
commit 1389cf2
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 83 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -15,6 +15,9 @@ This is an alpha version! The changes listed here are not final.
 ### Changed
 - Update checkout flow to connect "After" checkout vs before (if not connected).
 
+### Fixed
+- Use Current_Plan to check/return from has_required_plan on VP product class
+
 ## [3.9.1] - 2023-10-19
 ### Changed
 - Make has_required_plan return true (as it was before #33410) as a way to revert the change. [#33697]

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/src/products/class-videopress.php b/jetpack_vendor/automattic/jetpack-my-jetpack/src/products/class-videopress.php
@@ -7,6 +7,7 @@
 
 namespace Automattic\Jetpack\My_Jetpack\Products;
 
+use Automattic\Jetpack\Current_Plan;
 use Automattic\Jetpack\My_Jetpack\Hybrid_Product;
 use Automattic\Jetpack\My_Jetpack\Wpcom_Products;
 
@@ -163,7 +164,7 @@ public static function get_manage_url() {
 	 * @return boolean
 	 */
 	public static function has_required_plan() {
-		// TODO: import and perform a proper check with Current_Plan. See #33410.
-		return true;
+		// using second argument `true` to force fetching from wpcom
+		return Current_Plan::supports( 'videopress-1tb-storage', true );
 	}
 }
diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -38,7 +38,7 @@
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '3.10.0-alpha1697849167',
+      'ver' => '3.10.0-alpha1697905627',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "7b4057997e8ba3e692f3f42e43209a5e0c1e7284"
+                "reference": "3cf1d26601782f25ef0a5c2b74aa21cf11b50f71"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -57,7 +57,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "0088f999ed57f9d521fc0bf6c31a14e7bc01e805"
+                "reference": "e865abb29109e36265bac592378b58ae60c286a1"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -119,7 +119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "7af6440b042fd98f16872d071c3dfd8bd94bc3ac"
+                "reference": "2d5a34a7c927cfb76ffef393c32128d0686828d9"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -187,7 +187,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "8c08f5d1d68b5ce76088d55f0f06a59274f8fa3b"
+                "reference": "4f6fe9d05b60fe998ac2f41149aea4383828a626"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -252,7 +252,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "17d0ecf0685468fa9f99da4ac5e7d4f17a8a2673"
+                "reference": "877194d258ee52573ba7b6d37756f6bc0812b27e"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -311,7 +311,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "20c402ee2868f6360822233a65c605a13a9ead46"
+                "reference": "c5513e89411eacb3554a645cd7d0afdd89f2012b"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11"
@@ -353,7 +353,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "8096df43006ccfe47967b1e74332762630ed6579"
+                "reference": "4b749f8b8ae23655df060977ef9293b529399636"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -431,7 +431,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "5bc42aa26e738a32add08349ae2f643fc85c3ffa"
+                "reference": "0ee24825b3d82ba35287c192e5a76cec9d2e6f0e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -482,7 +482,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "f44a947cdb91b94b145b242cd031d98eb7debe0c"
+                "reference": "3589338bfcbc21f66db2f82da6dfc5235e51dd80"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -532,7 +532,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
-                "reference": "1440973f33d9579a317c718789c373311f8e08e7"
+                "reference": "c733bb6595dda115f193a875a8e7b8ba0bfea62e"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.13",
@@ -610,7 +610,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "a7790d7d484c84c858bd07e3ccb085b0d292bbef"
+                "reference": "6ea45971ca439eab21539d69c2e7120926adea7e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -665,7 +665,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "974781777a1cc24b577df5fae4e322bb7ef0cc31"
+                "reference": "0adb8cfe3ba60ced91fd010e0c49d4549c397804"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22",
@@ -740,7 +740,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "54f20cd53be758cbffdbb83dd8fc5da79de5c860"
+                "reference": "c9f4aa5ff31dec11ec862e120f91864cdd197483"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2"
@@ -801,7 +801,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "2377217294bad57567dc8232a4bc0b95de4f106a"
+                "reference": "cfaf6b296d2428bf300621b30f87698e6bb00fc7"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -846,12 +846,12 @@
         },
         {
             "name": "automattic/jetpack-my-jetpack",
-            "version": "3.10.0-alpha.1697849167",
-            "version_normalized": "3.10.0.0-alpha1697849167",
+            "version": "3.10.0-alpha.1697905627",
+            "version_normalized": "3.10.0.0-alpha1697905627",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "23cbd40b8c9201aca154e3aea7b2e5be5c0d271a"
+                "reference": "c31d87c3cd0596f8d666782cba519fc7fb064c16"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.2.23",
@@ -942,7 +942,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-partner",
-                "reference": "7123521a81e32fc9bb0dc6bb93dd5a3fcb2463a3"
+                "reference": "c7208be65bcc53f505ed85db53488eadcb53a9a3"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2",
@@ -1004,7 +1004,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "871974d70d1e2002233040a9d3c0ff008f43f3d6"
+                "reference": "e0e5c42683102001c0eecbf5f3decced21ba0930"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1062,7 +1062,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "2b5e04fcc5b23df371d9219fe716b8ec8d87fea9"
+                "reference": "227bd23041e9c3e8e0aaae10e3132889dc455df5"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2"
@@ -1129,7 +1129,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "b78593cae8ea84e6f1fe377ce3d26c3669a774a7"
+                "reference": "2fb39d6ab2d63603d33ba2fd4506e7208854b00b"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.22"
@@ -1183,7 +1183,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "729568737c225a6d37eb53b52073adf7921234e2"
+                "reference": "737187fb9fe18d97b40153ffa643440982080a38"
             },
             "require": {
                 "automattic/jetpack-status": "^1.18.5"
@@ -1237,7 +1237,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "835ab9328258f6af610293d758dce9dd07a2e8c2"
+                "reference": "0698b73ea54fbe17bccb53f3376ce6048b51da67"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.11",
@@ -1288,7 +1288,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-search",
-                "reference": "ba18d7f207e474622b4b5bdd339200910c920dc6"
+                "reference": "3e07bdb4abca6040c0651c3de1ed0d819afd0423"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.13",
@@ -1374,7 +1374,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats",
-                "reference": "0eb23dd386aa1521a142a882fa7cb10e1a56fd6d"
+                "reference": "0ce5b0014aafb6f7bf6c7144662f6199ab7c383a"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.13",
@@ -1438,7 +1438,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "c7b4fb79a353a208a109066de42edfb945b9001f"
+                "reference": "675f8f3a76603d061e89f42a2c505cdb5ada9460"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -1493,7 +1493,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "c7fc8b7abc4c59878bf1f58add8e73a6edd41107"
+                "reference": "4091fd01e0cd9f54e9abbb17f14b7b5de8844d3c"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.58.2",