Merge pull request #233 from webreinvent/2.x-feature/session-fixes

2.x feature 2.x develop | Updated: session keys in env
webreinvent · Jan 19, 2024 · e9dd125 · e9dd125
2 parents 8f903c9 + 35af503
commit e9dd125
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 24 deletions.
diff --git a/Http/Controllers/SetupController.php b/Http/Controllers/SetupController.php
@@ -299,7 +299,7 @@ public function testConfigurations(Request $request)
 
         $rules = array(
             'app_env' => 'required',
-            'app_name' => 'required',
+            'app_name' => 'required|alpha_dash',
             'app_timezone' => 'required',
             'mail_from_name' => 'required',
             'mail_from_address' => 'required',
@@ -326,24 +326,8 @@ public function testConfigurations(Request $request)
             return response()->json($response);
         }
 
-
-
-        //verify mail configuration if set
-        /*if($request->has('mail_is_valid') && $request->mail_is_valid == false)
-        {
-            if($request->has('mail_provider') && !empty($request->mail_provider))
-            {
-                $response['success'] = false;
-                $response['errors'][] = 'Test the mail configuration';
-                return response()->json($response);
-            }
-        }*/
-
-
         $response = VaahSetup::verifyAppUrl($request);
 
-
-
         if(!$response['success'])
         {
             return response()->json($response);

diff --git a/Resources/assets/backend/vaahtwo/build/main.js b/Resources/assets/backend/vaahtwo/build/main.js
diff --git a/Resources/views/templates/env.blade.php b/Resources/views/templates/env.blade.php
@@ -28,8 +28,10 @@
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+CACHE_PREFIX={{$data->app_name ? strtolower($data->app_name): '' }}
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
+SESSION_COOKIE={{$data->app_name ? strtolower($data->app_name): '' }}
 SESSION_LIFETIME=120
 
 REDIS_HOST=127.0.0.1

diff --git a/Vue/vaahtwo/pages/public/setup/intall/Account.vue b/Vue/vaahtwo/pages/public/setup/intall/Account.vue
@@ -130,7 +130,6 @@ onMounted(async () => {
                         :suggestions="store.filtered_country_codes"
                         :completeOnFocus="store.autocomplete_on_focus"
                         @complete="store.searchCountryCode"
-                        @blur="store.setFocusDropDownToTrue"
                         @item-select="store.onSelectCountryCode"
                         placeholder="Enter Your Country"
                         optionLabel="name"

diff --git a/Vue/vaahtwo/pages/public/setup/intall/Configuration.vue b/Vue/vaahtwo/pages/public/setup/intall/Configuration.vue
@@ -93,11 +93,13 @@ onMounted(async () => {
                       <h5 class="text-left p-1 title is-6">App/Website Name</h5>
                       <div class="p-input">
                           <InputText v-model="store.config.env.app_name"
-                                     placeholder="App/Website Name"
+                                     placeholder="Enter your website or app name"
                                      name="config-app_name"
                                      class="p-inputtext-sm" id="app-name"
                                      data-testid="configuration-app_name"
                                      required
+                                     @update:modelValue="store.onUpdateAppName"
+                                     @keydown.space.prevent
                           />
                           <div class="required-field hidden"></div>
                       </div>

diff --git a/Vue/vaahtwo/stores/setup.js b/Vue/vaahtwo/stores/setup.js
@@ -58,7 +58,7 @@ export const useSetupStore = defineStore({
 
             },
             env:{
-                app_name: "VaahCMS",
+                app_name: null,
                 app_key: null,
                 app_debug: 'true',
                 app_env: null,
@@ -622,7 +622,7 @@ export const useSetupStore = defineStore({
 
                 },
                 env:{
-                    app_name: "VaahCMS",
+                    app_name: null,
                     app_key: null,
                     app_debug: 'true',
                     app_env: null,
@@ -657,12 +657,12 @@ export const useSetupStore = defineStore({
 
            setTimeout(() => {
                 if (!event.query.trim().length) {
-                    this.filtered_country_codes = this.assets.country_calling_codes;
+                    this.filtered_country_codes = vaah().clone(this.assets.country_calling_codes);
                 }
                 else {
-                    this.filtered_country_codes = this.assets.country_calling_codes.filter((country) => {
+                    this.filtered_country_codes =  vaah().clone(this.assets.country_calling_codes.filter((country) => {
                         return country.name.toLowerCase().startsWith(event.query.toLowerCase());
-                    });
+                    }));
                 }
             }, 250);
         },
@@ -690,6 +690,10 @@ export const useSetupStore = defineStore({
             this.config.count_installed_progress = 100;
         },
         //---------------------------------------------------------------------
+        onUpdateAppName: function (value) {
+            this.config.env.app_name = value.replace(/\s/g,'');
+        },
+        //---------------------------------------------------------------------
 
         //---------------------------------------------------------------------
         async installDependencies() {