@fleetbase/registry-bridge-engine 0.0.5 → 0.0.7

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/registry-bridge",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Registry Bridge",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "repository": "https://github.com/fleetbase/registry-bridge",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/registry-bridge-engine",
-    "version": "0.0.5",
+    "version": "0.0.7",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "fleetbase": {
         "route": "extensions"

package/server/src/Console/Commands/Initialize.php

@@ -2,7 +2,7 @@
 
 namespace Fleetbase\RegistryBridge\Console\Commands;
 
-use Fleetbase\RegistryBridge\Providers\RegistryBridgeServiceProvider;
+use Fleetbase\RegistryBridge\Support\Utils;
 use Illuminate\Console\Command;
 
 class Initialize extends Command
@@ -28,7 +28,7 @@ class Initialize extends Command
      */
     public function handle()
     {
-        RegistryBridgeServiceProvider::bootRegistryAuth(true);
+        Utils::bootRegistryAuth(true);
 
         return 0;
     }

package/server/src/Http/Controllers/Internal/v1/RegistryExtensionController.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\RegistryBridge\Http\Controllers\Internal\v1;
 
 use Fleetbase\Exceptions\FleetbaseRequestValidationException;
+use Fleetbase\Http\Requests\AdminRequest;
 use Fleetbase\Models\Setting;
 use Fleetbase\RegistryBridge\Http\Controllers\RegistryBridgeController;
 use Fleetbase\RegistryBridge\Http\Requests\CreateRegistryExtensionRequest;
@@ -262,9 +263,11 @@ class RegistryExtensionController extends RegistryBridgeController
      * This method fetches the current registry host and token from the configuration
      * settings or environment variables and returns them in a JSON response.
      *
+     * @param AdminRequest $request the incoming HTTP request containing the new host and token
+     *
      * @return \Illuminate\Http\JsonResponse a JSON response containing the registry host and token
      */
-    public function getConfig()
+    public function getConfig(AdminRequest $request)
     {
         $registryHost     = config('registry-bridge.registry.host', env('REGISTRY_HOST', 'https://registry.fleetbase.io'));
         $registryToken    = config('registry-bridge.registry.token', env('REGISTRY_TOKEN'));
@@ -282,11 +285,11 @@ class RegistryExtensionController extends RegistryBridgeController
      * If no input is provided, it uses the current configuration values or environment variables.
      * The updated configuration is then saved in the settings and returned in a JSON response.
      *
-     * @param Request $request the incoming HTTP request containing the new host and token
+     * @param AdminRequest $request the incoming HTTP request containing the new host and token
      *
      * @return \Illuminate\Http\JsonResponse a JSON response containing the updated registry host and token
      */
-    public function saveConfig(Request $request)
+    public function saveConfig(AdminRequest $request)
     {
         $currentRegistryHost     = config('registry-bridge.registry.host', env('REGISTRY_HOST', 'https://registry.fleetbase.io'));
         $currentRegistryToken    = config('registry-bridge.registry.token', env('REGISTRY_TOKEN'));

package/server/src/Providers/RegistryBridgeServiceProvider.php

@@ -27,7 +27,6 @@ class RegistryBridgeServiceProvider extends CoreServiceProvider
      * @var array
      */
     public $commands = [
-        \Fleetbase\RegistryBridge\Console\Commands\PostInstallExtension::class,
         \Fleetbase\RegistryBridge\Console\Commands\Initialize::class,
     ];
 

package/server/src/Console/Commands/PostInstallExtension.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace Fleetbase\RegistryBridge\Console\Commands;
-
-use Fleetbase\RegistryBridge\Models\RegistryExtension;
-use Illuminate\Console\Command;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Process;
-
-class PostInstallExtension extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'registry:post-install {extensionId}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Post install an extension by running necessary commands';
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $extensionId = $this->argument('extensionId');
-        $extension   = RegistryExtension::disableCache()->where('public_id', $extensionId)->first();
-
-        if ($extension) {
-            $this->postInstallExtension($extension);
-            $this->info('Post install commands executed successfully.');
-        } else {
-            $this->error('Extension not found.');
-        }
-
-        return 0;
-    }
-
-    /**
-     * Post install extension commands.
-     */
-    public function postInstallExtension(RegistryExtension $extension): void
-    {
-        if (isset($extension->currentBundle)) {
-            $composerJson = $extension->currentBundle->meta['composer.json'];
-            if ($composerJson) {
-                $extensionPath = base_path('vendor/' . $composerJson['name']);
-
-                $commands = [
-                    'rm -rf /fleetbase/.pnpm-store',
-                    'rm -rf node_modules',
-                    'pnpm install',
-                    'pnpm build',
-                ];
-
-                $this->info('Running post install for: ' . $extension->name);
-                $this->info('Extension install path: ' . $extensionPath);
-                foreach ($commands as $command) {
-                    $this->info('Running extension post install command: `' . $command . '`');
-                    $process = Process::fromShellCommandline($command, $extensionPath);
-                    $process->run(function ($type, $buffer) {
-                        if (Process::ERR === $type) {
-                            $this->error($buffer);
-                        } else {
-                            $this->info($buffer);
-                        }
-                    });
-
-                    // Check if the process was successful
-                    if (!$process->isSuccessful()) {
-                        throw new ProcessFailedException($process);
-                    }
-                }
-            }
-        }
-    }
-}