Merge pull request #4 from fleetbase/dev-v0.0.5

critical patch which removes the bootauth from the service provider
fleetbase · Jul 19, 2024 · bf3e355 · bf3e355
2 parents 58e483f + a2c73ce
commit bf3e355
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/registry-bridge",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "keywords": [
         "fleetbase-extension",

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

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/registry-bridge-engine",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "fleetbase": {
         "route": "extensions"

diff --git a/server/src/Providers/RegistryBridgeServiceProvider.php b/server/src/Providers/RegistryBridgeServiceProvider.php
@@ -4,7 +4,6 @@
 
 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 @@ public function register()
      */
     public function boot()
     {
-        Utils::bootRegistryAuth();
         $this->registerCommands();
         $this->registerMiddleware();
         $this->registerExpansionsFrom(__DIR__ . '/../Expansions');
@@ -82,6 +80,17 @@ public function boot()
         $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()) {