Updated composer deps, applied StyleCI changes

[bookstack] / app / Http / Controllers / WebhookController.php

diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php
index 588b256a35156ae92c11c806319445805e1c5f36..264921dfc39ed7743f1f58f27afe5d400196a2a9 100644 (file)
--- a/app/Http/Controllers/WebhookController.php
+++ b/app/Http/Controllers/WebhookController.php
@@ -24,6 +24,9 @@ class WebhookController extends Controller
             ->orderBy('name', 'desc')
             ->with('trackedEvents')
             ->get();
             ->orderBy('name', 'desc')
             ->with('trackedEvents')
             ->get();

+
+        $this->setPageTitle(trans('settings.webhooks'));
+

         return view('settings.webhooks.index', ['webhooks' => $webhooks]);
     }
 
         return view('settings.webhooks.index', ['webhooks' => $webhooks]);
     }
 


@@ -32,6 +35,8 @@ class WebhookController extends Controller
      */
     public function create()
     {
      */
     public function create()
     {

+        $this->setPageTitle(trans('settings.webhooks_create'));
+

         return view('settings.webhooks.create');
     }
 
         return view('settings.webhooks.create');
     }
 


@@ -41,10 +46,11 @@ class WebhookController extends Controller
     public function store(Request $request)
     {
         $validated = $this->validate($request, [
     public function store(Request $request)
     {
         $validated = $this->validate($request, [

-            'name' => ['required', 'max:150'],
+            'name'     => ['required', 'max:150'],

             'endpoint' => ['required', 'url', 'max:500'],
             'endpoint' => ['required', 'url', 'max:500'],

-            'events' => ['required', 'array'],
-            'active' => ['required'],
+            'events'   => ['required', 'array'],
+            'active'   => ['required'],
+            'timeout'  => ['required', 'integer', 'min:1', 'max:600'],

         ]);
 
         $webhook = new Webhook($validated);
         ]);
 
         $webhook = new Webhook($validated);


@@ -53,6 +59,7 @@ class WebhookController extends Controller
         $webhook->updateTrackedEvents(array_values($validated['events']));
 
         $this->logActivity(ActivityType::WEBHOOK_CREATE, $webhook);
         $webhook->updateTrackedEvents(array_values($validated['events']));
 
         $this->logActivity(ActivityType::WEBHOOK_CREATE, $webhook);

+

         return redirect('/settings/webhooks');
     }
 
         return redirect('/settings/webhooks');
     }
 


@@ -66,6 +73,8 @@ class WebhookController extends Controller
             ->with('trackedEvents')
             ->findOrFail($id);
 
             ->with('trackedEvents')
             ->findOrFail($id);
 

+        $this->setPageTitle(trans('settings.webhooks_edit'));
+

         return view('settings.webhooks.edit', ['webhook' => $webhook]);
     }
 
         return view('settings.webhooks.edit', ['webhook' => $webhook]);
     }
 


@@ -75,10 +84,11 @@ class WebhookController extends Controller
     public function update(Request $request, string $id)
     {
         $validated = $this->validate($request, [
     public function update(Request $request, string $id)
     {
         $validated = $this->validate($request, [

-            'name' => ['required', 'max:150'],
+            'name'     => ['required', 'max:150'],

             'endpoint' => ['required', 'url', 'max:500'],
             'endpoint' => ['required', 'url', 'max:500'],

-            'events' => ['required', 'array'],
-            'active' => ['required'],
+            'events'   => ['required', 'array'],
+            'active'   => ['required'],
+            'timeout'  => ['required', 'integer', 'min:1', 'max:600'],

         ]);
 
         /** @var Webhook $webhook */
         ]);
 
         /** @var Webhook $webhook */


@@ -89,6 +99,7 @@ class WebhookController extends Controller
         $webhook->updateTrackedEvents($validated['events']);
 
         $this->logActivity(ActivityType::WEBHOOK_UPDATE, $webhook);
         $webhook->updateTrackedEvents($validated['events']);
 
         $this->logActivity(ActivityType::WEBHOOK_UPDATE, $webhook);

+

         return redirect('/settings/webhooks');
     }
 
         return redirect('/settings/webhooks');
     }
 


@@ -99,6 +110,9 @@ class WebhookController extends Controller
     {
         /** @var Webhook $webhook */
         $webhook = Webhook::query()->findOrFail($id);
     {
         /** @var Webhook $webhook */
         $webhook = Webhook::query()->findOrFail($id);

+
+        $this->setPageTitle(trans('settings.webhooks_delete'));
+

         return view('settings.webhooks.delete', ['webhook' => $webhook]);
     }
 
         return view('settings.webhooks.delete', ['webhook' => $webhook]);
     }
 


@@ -114,6 +128,7 @@ class WebhookController extends Controller
         $webhook->delete();
 
         $this->logActivity(ActivityType::WEBHOOK_DELETE, $webhook);
         $webhook->delete();
 
         $this->logActivity(ActivityType::WEBHOOK_DELETE, $webhook);

+

         return redirect('/settings/webhooks');
     }
 }
         return redirect('/settings/webhooks');
     }
 }