@fleetbase/registry-bridge-engine 0.0.4 → 0.0.6

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/registry-bridge",
-    "version": "0.0.4",
+    "version": "0.0.6",
     "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.4",
+    "version": "0.0.6",
     "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.4",
+    "version": "0.0.6",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "fleetbase": {
         "route": "extensions"

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

@@ -4,7 +4,6 @@ namespace Fleetbase\RegistryBridge\Providers;
 
 use Fleetbase\Models\Setting;
 use Fleetbase\Providers\CoreServiceProvider;
-use Fleetbase\RegistryBridge\Support\Utils;
 
 if (!class_exists(CoreServiceProvider::class)) {
     throw new \Exception('Registry Bridge cannot be loaded without `fleetbase/core-api` installed!');
@@ -72,7 +71,6 @@ class RegistryBridgeServiceProvider extends CoreServiceProvider
      */
     public function boot()
     {
-        Utils::bootRegistryAuth();
         $this->registerCommands();
         $this->registerMiddleware();
         $this->registerExpansionsFrom(__DIR__ . '/../Expansions');
@@ -82,6 +80,17 @@ class RegistryBridgeServiceProvider extends CoreServiceProvider
         $this->mergeConfigFromSettings();
     }
 
+    /**
+     * Merge configuration settings from the database into the application configuration.
+     *
+     * This function checks if there is a database connection available. If a connection exists,
+     * it retrieves the 'registry-bridge.registry.host' and 'registry-bridge.registry.token' values
+     * from the settings table and merges them into the application's configuration. If the settings
+     * are not available or the database connection does not exist, the function will return without
+     * making any changes.
+     *
+     * @return void
+     */
     public function mergeConfigFromSettings()
     {
         if (Setting::doesntHaveConnection()) {