wip

Author: mpociot

config/mailbox.php

@@ -26,6 +26,8 @@
      */
     'store_incoming_emails_for_days' => 7,
 
+    'only_store_matching_emails' => true,
+
     /*
      * Some services do not have their own authentication methods to
      * verify the incoming request. For these services, you need

src/Routing/Route.php

@@ -22,6 +22,8 @@ class Route
     const TO = 'to';
     const CC = 'cc';
     const SUBJECT = 'subject';
+    const FALLBACK = 'fallback';
+    const CATCH_ALL = 'catch-all';
 
     protected $mailbox;
 

src/Routing/Router.php

@@ -4,12 +4,19 @@
 
 use BeyondCode\Mailbox\InboundEmail;
 use Illuminate\Container\Container;
+use Illuminate\Support\Collection;
 
 class Router
 {
     /** @var RouteCollection */
     protected $routes;
 
+    /** @var Route */
+    protected $fallbackRoute;
+
+    /** @var Route */
+    protected $catchAllRoute;
+
     /** @var Container */
     protected $container;
 
@@ -40,6 +47,16 @@ public function subject(string $pattern, $action)
         $this->addRoute(Route::SUBJECT, $pattern, $action);
     }
 
+    public function fallback($action)
+    {
+        $this->fallbackRoute = $this->createRoute(Route::FALLBACK, '', $action);
+    }
+
+    public function catchAll($action)
+    {
+        $this->catchAllRoute = $this->createRoute(Route::CATCH_ALL, '', $action);
+    }
+
     protected function addRoute(string $subject, string $pattern, $action)
     {
         $this->routes->add($this->createRoute($subject, $pattern, $action));
@@ -59,17 +76,42 @@ public function callMailboxes(InboundEmail $email)
                 $route->run($email);
             });
 
-            if ($this->shouldStoreInboundEmails() && $matchedRoutes->isNotEmpty()) {
+            if ($matchedRoutes->isEmpty()) {
+                $this->callFallback($email);
+            }
+
+            $this->callCatchAll($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;
     }
 
+    protected function shouldStoreAllInboundEmails(Collection $matchedRoutes): bool
+    {
+        return $matchedRoutes->isNotEmpty() ? true : ! config('mailbox.only_store_matching_emails');
+    }
+
     protected function storeEmail(InboundEmail $email)
     {
         $email->save();

tests/InboundEmailTest.php

@@ -31,24 +31,40 @@ public function it_stores_inbound_emails()
     }
 
     /** @test */
-    public function it_does_not_store_inbound_emails_if_configured()
+    public function it_stores_all_inbound_emails()
     {
-        $this->app['config']['mailbox.store_incoming_emails_for_days'] = 0;
+        $this->app['config']['mailbox.only_store_matching_emails'] = false;
 
-        Mailbox::from('example@beyondco.de', function($email) {
+        Mailbox::to('someone@beyondco.de', function($email) {
         });
 
         Mail::to('[email protected]')->send(new TestMail);
+        Mail::to('[email protected]')->send(new TestMail);
+
+        $this->assertSame(2, InboundEmail::query()->count());
+    }
+
+    /** @test */
+    public function it_can_use_fallbacks()
+    {
+        Mailbox::fallback(function(InboundEmail $email) {
+            Mail::fake();
+
+            $email->reply(new ReplyMail);
+        });
+
         Mail::to('[email protected]')->send(new TestMail);
 
-        $this->assertSame(0, InboundEmail::query()->count());
+        Mail::assertSent(ReplyMail::class);
     }
 
     /** @test */
-    public function it_can_reply_to_mails()
+    public function it_can_use_catchall()
     {
+        Mailbox::to('[email protected]', function($email) {
+        });
 
-        Mailbox::from('[email protected]', function(InboundEmail $email) {
+        Mailbox::catchAll(function(InboundEmail $email) {
             Mail::fake();
 
             $email->reply(new ReplyMail);
@@ -60,14 +76,32 @@ public function it_can_reply_to_mails()
     }
 
     /** @test */
-    public function it_can_forward_mails()
+    public function it_does_not_store_inbound_emails_if_configured()
+    {
+        $this->app['config']['mailbox.store_incoming_emails_for_days'] = 0;
+
+        Mailbox::from('[email protected]', function($email) {
+        });
+
+        Mail::to('[email protected]')->send(new TestMail);
+        Mail::to('[email protected]')->send(new TestMail);
+
+        $this->assertSame(0, InboundEmail::query()->count());
+    }
+
+    /** @test */
+    public function it_can_reply_to_mails()
     {
 
         Mailbox::from('[email protected]', function(InboundEmail $email) {
-            $email->forward('[email protected]');
+            Mail::fake();
+
+            $email->reply(new ReplyMail);
         });
 
         Mail::to('[email protected]')->send(new TestMail);
+
+        Mail::assertSent(ReplyMail::class);
     }
 
 }