Merge pull request coollabsio#3874 from coollabsio/next

fixes for v4.0.0-beta.359
shiv122 · Oct 11, 2024 · ab8851e · ab8851e
2 parents ccf4e7d + 0714fc0
commit ab8851e
Show file tree

Hide file tree

Showing 3 changed files with 197 additions and 193 deletions.
diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -319,7 +319,7 @@ public function extraFields()
                     if ($password) {
                         $data = $data->merge([
                             'Password' => [
-                                'key' => 'LABEL_STUDIO_PASSWORD',
+                                'key' => data_get($password, 'key'),
                                 'value' => data_get($password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -359,7 +359,7 @@ public function extraFields()
                     if ($email) {
                         $data = $data->merge([
                             'Admin Email' => [
-                                'key' => 'LANGFUSE_INIT_USER_EMAIL',
+                                'key' => data_get($email, 'key'),
                                 'value' => data_get($email, 'value'),
                                 'rules' => 'required|email',
                             ],
@@ -370,7 +370,7 @@ public function extraFields()
                     if ($password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'LANGFUSE_INIT_USER_PASSWORD',
+                                'key' => data_get($password, 'key'),
                                 'value' => data_get($password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -384,15 +384,15 @@ public function extraFields()
                     $email = $this->environment_variables()->where('key', 'IN_USER_EMAIL')->first();
                     $data = $data->merge([
                         'Email' => [
-                            'key' => 'IN_USER_EMAIL',
+                            'key' => data_get($email, 'key'),
                             'value' => data_get($email, 'value'),
                             'rules' => 'required|email',
                         ],
                     ]);
                     $password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_INVOICENINJAUSER')->first();
                     $data = $data->merge([
                         'Password' => [
-                            'key' => 'IN_PASSWORD',
+                            'key' => data_get($password, 'key'),
                             'value' => data_get($password, 'value'),
                             'rules' => 'required',
                             'isPassword' => true,
@@ -487,7 +487,7 @@ public function extraFields()
                     if ($admin_password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'SERVICE_PASSWORD_TOLGEE',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -534,7 +534,7 @@ public function extraFields()
                     if ($admin_password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'SERVICE_PASSWORD_UNLEASH',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -557,7 +557,7 @@ public function extraFields()
                     if ($admin_password) {
                         $data = $data->merge([
                             'Admin Password' => [
-                                'key' => 'GF_SECURITY_ADMIN_PASSWORD',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -919,7 +919,7 @@ public function extraFields()
                     if ($admin_user) {
                         $data = $data->merge([
                             'User' => [
-                                'key' => 'SERVICE_USER_ADMIN',
+                                'key' => data_get($admin_user, 'key'),
                                 'value' => data_get($admin_user, 'value', 'admin'),
                                 'readonly' => true,
                                 'rules' => 'required',
@@ -929,7 +929,7 @@ public function extraFields()
                     if ($admin_password) {
                         $data = $data->merge([
                             'Password' => [
-                                'key' => 'SERVICE_PASSWORD_ADMIN',
+                                'key' => data_get($admin_password, 'key'),
                                 'value' => data_get($admin_password, 'value'),
                                 'rules' => 'required',
                                 'isPassword' => true,
@@ -939,7 +939,7 @@ public function extraFields()
                     if ($admin_email) {
                         $data = $data->merge([
                             'Email' => [
-                                'key' => 'ADMIN_EMAIL',
+                                'key' => data_get($admin_email, 'key'),
                                 'value' => data_get($admin_email, 'value'),
                                 'rules' => 'required|email',
                             ],

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "guzzlehttp/guzzle": "^7.5.0",
         "laravel/fortify": "^v1.16.0",
         "laravel/framework": "^v11",
-        "laravel/horizon": "^5.27.1",
+        "laravel/horizon": "^5.29.1",
         "laravel/prompts": "^0.1.6",
         "laravel/sanctum": "^v4.0",
         "laravel/socialite": "^v5.14.0",