Skip intermediate login page with single provider

[bookstack] / app / Actions / WebhookFormatter.php

diff --git a/app/Actions/WebhookFormatter.php b/app/Actions/WebhookFormatter.php
index 48b1a392944d23e9616ded1cbc4b7480f4dc75ce..bd0b6853ab62ec6b475b3fca9a40688f7acc3740 100644 (file)
--- a/app/Actions/WebhookFormatter.php
+++ b/app/Actions/WebhookFormatter.php
@@ -60,13 +60,13 @@ class WebhookFormatter
 
     /**
      * @param callable(string, Model):bool $condition
 
     /**
      * @param callable(string, Model):bool $condition

-     * @param callable(Model):void $format
+     * @param callable(Model):void         $format

      */
     public function addModelFormatter(callable $condition, callable $format): void
     {
         $this->modelFormatters[] = [
             'condition' => $condition,
      */
     public function addModelFormatter(callable $condition, callable $format): void
     {
         $this->modelFormatters[] = [
             'condition' => $condition,

-            'format' => $format,
+            'format'    => $format,

         ];
     }
 
         ];
     }
 


@@ -74,14 +74,14 @@ class WebhookFormatter
     {
         // Load entity owner, creator, updater details
         $this->addModelFormatter(
     {
         // Load entity owner, creator, updater details
         $this->addModelFormatter(

-            fn($event, $model) => ($model instanceof Entity),
-            fn($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])
+            fn ($event, $model) => ($model instanceof Entity),
+            fn ($model) => $model->load(['ownedBy', 'createdBy', 'updatedBy'])

         );
 
         // Load revision detail for page update and create events
         $this->addModelFormatter(
         );
 
         // Load revision detail for page update and create events
         $this->addModelFormatter(

-            fn($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
-            fn($model) => $model->load('currentRevision')
+            fn ($event, $model) => ($model instanceof Page && ($event === ActivityType::PAGE_CREATE || $event === ActivityType::PAGE_UPDATE)),
+            fn ($model) => $model->load('currentRevision')

         );
     }
 
         );
     }
 


@@ -116,8 +116,9 @@ class WebhookFormatter
 
     public static function getDefault(string $event, Webhook $webhook, $detail, User $initiator, int $initiatedTime): self
     {
 
     public static function getDefault(string $event, Webhook $webhook, $detail, User $initiator, int $initiatedTime): self
     {

-        $instance = new static($event, $webhook, $detail, $initiator, $initiatedTime);
+        $instance = new self($event, $webhook, $detail, $initiator, $initiatedTime);

         $instance->addDefaultModelFormatters();
         $instance->addDefaultModelFormatters();

+

         return $instance;
     }
         return $instance;
     }

-}
\ No newline at end of file
+}