Fix enable/disable, fix improper config publish

- [Fix] Enabling/disabling of the magic link usage was not saved correctly - [Fix] Publishing of config file
codedge · Sep 18, 2020 · 8d1199c · 8d1199c
1 parent 9e9cda9
commit 8d1199c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/public/js/statamic-magiclink.js b/public/js/statamic-magiclink.js
diff --git a/resources/js/components/SettingsComponent.vue b/resources/js/components/SettingsComponent.vue
@@ -5,15 +5,15 @@
             <form-group
                 class="toggle-fieldtype"
                 fieldtype="toggle"
-                handle="isEnabled"
+                handle="enabled"
                 :display="__('magiclink::cp.settings.ml_enabled')"
                 :instructions="__('magiclink::cp.settings.ml_enabled_instructions')"
-                v-model="isEnabled"
+                v-model="enabled"
             />
 
             <form-group
-                handle="expireTime"
                 class="border-b"
+                handle="expireTime"
                 :display="__('magiclink::cp.settings.ml_expire_time')"
                 :errors="errors.expireTime"
                 :instructions="__('magiclink::cp.settings.ml_expire_time_instructions')"
@@ -38,7 +38,7 @@
                 type: Number,
                 required: true,
             },
-            initialIsEnabled: {
+            initialEnabled: {
                 type: Boolean,
                 required: true,
             },
@@ -56,7 +56,7 @@
           return {
               error: null,
               errors: {},
-              isEnabled: this.initialIsEnabled,
+              enabled: this.initialEnabled,
               expireTime: this.initialExpireTime,
           }
         },
@@ -68,7 +68,7 @@
 
             payload() {
                 return {
-                    isEnabled: this.isEnabled,
+                    enabled: this.enabled,
                     expireTime: this.expireTime,
                 }
             },

diff --git a/resources/views/cp/settings/index.blade.php b/resources/views/cp/settings/index.blade.php
@@ -13,7 +13,7 @@
         method="patch"
         action="{{ cp_route('magiclink.update') }}"
         index-url="{{ cp_route('dashboard') }}"
-        initial-is-enabled="{{ Statamic\Support\Str::bool($isEnabled) }}"
+        :initial-enabled="{{ Statamic\Support\Str::bool($enabled) }}"
         initial-expire-time="{{ $expireTime }}"
     ></magiclink-settings>
 

diff --git a/src/Http/Controllers/Cp/SettingsController.php b/src/Http/Controllers/Cp/SettingsController.php
@@ -28,7 +28,7 @@ public function update(Request $request)
         $this->authorize('view settings');
 
         $request->validate([
-            'isEnabled' => ['required', 'boolean'],
+            'enabled' => ['required', 'boolean'],
             'expireTime' => ['required', 'numeric'],
         ]);
 

diff --git a/src/Repositories/SettingsRepository.php b/src/Repositories/SettingsRepository.php
@@ -22,7 +22,7 @@ public function __construct(Filesystem $files)
         $this->path = storage_path('statamic-magiclink/settings.yaml');
 
         $this->defaultValues = [
-          self::IS_ENABLED_KEY => true,
+          self::IS_ENABLED_KEY => false,
           self::EXPIRE_TIME_KEY => config('statamic-magiclink.expire_time'),
         ];
     }

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -56,6 +56,8 @@ public function boot() {
 
     public function register()
     {
+        $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'statamic-magiclink');
+
         /*
          * Swap login controller to be able to inject custom template.
          */
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,8 @@ public function boot() { @@
         public function register()
         {
+            $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'statamic-magiclink');
             /*
              * Swap login controller to be able to inject custom template.
              */
@@ Expand Down @@