Fix Mailgun issue and store catchAll mails

Author: mpociot

src/Http/Requests/MailgunRequest.php

@@ -27,7 +27,7 @@ public function validator()
 
     public function email()
     {
-        return InboundEmail::fromMessage($this->get('body-mime	'));
+        return InboundEmail::fromMessage($this->get('body-mime'));
     }
 
     protected function verifySignature()

src/Routing/Router.php

@@ -75,32 +75,22 @@ public function callMailboxes(InboundEmail $email)
                 $route->run($email);
             });
 
-            if ($matchedRoutes->isEmpty()) {
-                $this->callFallback($email);
+            if ($matchedRoutes->isEmpty() && $this->fallbackRoute) {
+                $matchedRoutes[] = $this->fallbackRoute;
+                $this->fallbackRoute->run($email);
             }
 
-            $this->callCatchAll($email);
+            if ($this->catchAllRoute) {
+                $matchedRoutes[] = $this->catchAllRoute;
+                $this->catchAllRoute->run($email);
+            }
 
             if ($this->shouldStoreInboundEmails() && $this->shouldStoreAllInboundEmails($matchedRoutes)) {
                 $this->storeEmail($email);
             }
         }
     }
 
-    protected function callFallback(InboundEmail $email)
-    {
-        if ($this->fallbackRoute) {
-            $this->fallbackRoute->run($email);
-        }
-    }
-
-    protected function callCatchAll(InboundEmail $email)
-    {
-        if ($this->catchAllRoute) {
-            $this->catchAllRoute->run($email);
-        }
-    }
-
     protected function shouldStoreInboundEmails(): bool
     {
         return config('mailbox.store_incoming_emails_for_days') > 0;

tests/InboundEmailTest.php

@@ -74,6 +74,46 @@ public function it_can_use_catchall()
         Mail::assertSent(ReplyMail::class);
     }
 
+    /** @test */
+    public function it_stores_inbound_emails_with_catchall()
+    {
+        Mailbox::catchAll(function ($email) {
+        });
+
+        Mail::to('someone@beyondco.de')->send(new TestMail);
+        Mail::to('someone-else@beyondco.de')->send(new TestMail);
+
+        $this->assertSame(2, InboundEmail::query()->count());
+    }
+
+    /** @test */
+    public function it_stores_inbound_emails_with_fallback()
+    {
+        Mailbox::fallback(function ($email) {
+        });
+
+        Mail::to('someone@beyondco.de')->send(new TestMail);
+        Mail::to('someone-else@beyondco.de')->send(new TestMail);
+
+        $this->assertSame(2, InboundEmail::query()->count());
+    }
+
+    /** @test */
+    public function it_stores_inbound_emails_with_fallback_and_catchall_only_once()
+    {
+        Mailbox::fallback(function ($email) {
+        });
+
+        Mailbox::catchAll(function ($email) {
+        });
+
+        Mail::to('someone@beyondco.de')->send(new TestMail);
+        Mail::to('someone-else@beyondco.de')->send(new TestMail);
+
+        $this->assertSame(2, InboundEmail::query()->count());
+    }
+
+
     /** @test */
     public function it_does_not_store_inbound_emails_if_configured()
     {