Avoid exception when plugins details can't be fetched from October CM…

…S market
1PilotApp · May 31, 2021 · 1e87296 · 1e87296
1 parent 72c3a3d
commit 1e87296
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/controllers/Plugins.php b/controllers/Plugins.php
@@ -2,6 +2,7 @@
 
 namespace OnePilot\Client\Controllers;
 
+use Exception;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Collection;
 use OnePilot\Client\Classes\Response;
@@ -40,7 +41,7 @@ public function update()
             $manager->downloadPlugin($code, $hash);
             $manager->extractPlugin($code, $hash);
             $manager->update();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             throw new OnePilotException('Error during plugin update', 500, $e);
         }
 
@@ -110,9 +111,13 @@ private function getPluginsDetails($plugins)
     {
         $updateManager = UpdateManager::instance();
 
-        $productsDetails = $updateManager->requestServerData('plugin/details', [
-            'names' => $plugins->pluck('code')->toArray(),
-        ]);
+        try {
+            $productsDetails = $updateManager->requestServerData('plugin/details', [
+                'names' => $plugins->pluck('code')->toArray(),
+            ]);
+        } catch (Exception $e) {
+            return collect();
+        }
 
         return collect($productsDetails)
             ->filter(function ($item) {

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -20,3 +20,5 @@
     - Fix compatibility issues with October 472
 1.1.0:
     - Add October v2 support, composer installation and possibility to disable update/install from 1Pilot
+1.1.1:
+    - Avoid exception when plugins details can't be fetched from October CMS market