fix: improve error message when plugin is not downloadable

matomo-org · Oct 11, 2024 · 54017d8 · 54017d8
1 parent 47a5d2a
commit 54017d8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/plugins/Marketplace/Api/Client.php b/plugins/Marketplace/Api/Client.php
@@ -321,6 +321,10 @@ public function getDownloadUrl($pluginOrThemeName)
     {
         $plugin = $this->getPluginInfo($pluginOrThemeName);
 
+		if (empty($plugin['isDownloadable'])) {
+			throw new Exception('Plugin is not downloadable. License may be missing or expired.');
+		}
+
         if (empty($plugin['versions'])) {
             throw new Exception('Plugin has no versions.');
         }

diff --git a/plugins/Marketplace/tests/System/Api/ClientTest.php b/plugins/Marketplace/tests/System/Api/ClientTest.php
@@ -209,6 +209,14 @@ public function testGetDownloadUrl()
         $this->assertRegExp('/\d+\.\d+\.\d+/', $version);
     }
 
+	public function testGetDownloadUrlMissingLicense()
+	{
+		$this->expectException(\Piwik\Plugins\Marketplace\Api\Exception::class);
+		$this->expectExceptionMessage('Plugin is not downloadable');
+
+		$this->client->getDownloadUrl('FormAnalytics');
+	}
+
     public function testClientResponseShouldBeCached()
     {
         $params = array(