Added ability to disable catch-all for domains

app/Http/Controllers/Api/AliasController.php

@@ -42,23 +42,31 @@ public function store(StoreAliasRequest $request)
             return response('', 429);
         }
 
-        if ($request->input('format', 'uuid') === 'random_words') {
-            $localPart = user()->generateRandomWordLocalPart();
-
+        if (isset($request->validated()['local_part'])) {
             $data = [
-                'email' => $localPart . '@' . $request->domain,
-                'local_part' => $localPart,
+                'email' => $request->validated()['local_part'] . '@' . $request->domain,
+                'local_part' => $request->validated()['local_part'],
             ];
         } else {
-            $uuid = Uuid::uuid4();
-
-            $data = [
-                'id' => $uuid,
-                'email' => $uuid . '@' . $request->domain,
-                'local_part' => $uuid,
-            ];
+            if ($request->input('format', 'uuid') === 'random_words') {
+                $localPart = user()->generateRandomWordLocalPart();
+
+                $data = [
+                    'email' => $localPart . '@' . $request->domain,
+                    'local_part' => $localPart,
+                ];
+            } else {
+                $uuid = Uuid::uuid4();
+
+                $data = [
+                    'id' => $uuid,
+                    'email' => $uuid . '@' . $request->domain,
+                    'local_part' => $uuid,
+                ];
+            }
         }
 
+
         // Check if domain is for additional username or custom domain
         $parentDomain = collect(config('anonaddy.all_domains'))
                     ->filter(function ($name) use ($request) {

app/Http/Controllers/Api/CatchAllDomainController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Http\Resources\DomainResource;
+use Illuminate\Http\Request;
+
+class CatchAllDomainController extends Controller
+{
+    public function store(Request $request)
+    {
+        $domain = user()->domains()->findOrFail($request->id);
+
+        $domain->enableCatchAll();
+
+        return new DomainResource($domain);
+    }
+
+    public function destroy($id)
+    {
+        $domain = user()->domains()->findOrFail($id);
+
+        $domain->disableCatchAll();
+
+        return response('', 204);
+    }
+}

app/Http/Requests/StoreAliasRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Requests;
 
+use App\Rules\ValidAliasLocalPart;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -31,7 +32,30 @@ public function rules()
                 Rule::in($this->user()->domainOptions())
             ],
             'description' => 'nullable|max:100',
-            'format' => 'nullable|in:uuid,random_words'
+            'format' => 'nullable|in:uuid,random_words,custom'
+        ];
+    }
+
+    public function withValidator($validator)
+    {
+        $validator->sometimes('local_part', [
+            'required',
+            'max:50',
+            Rule::unique('aliases')->where(function ($query) {
+                return $query->where('local_part', $this->validationData()['local_part'])
+                ->where('domain', $this->validationData()['domain']);
+            }),
+            new ValidAliasLocalPart
+        ], function () {
+            $format = $this->validationData()['format'] ?? 'uuid';
+            return $format === 'custom';
+        });
+    }
+
+    public function messages()
+    {
+        return [
+            'local_part.unique' => 'That alias already exists.',
         ];
     }
 }

app/Http/Resources/DomainResource.php

@@ -16,6 +16,7 @@ public function toArray($request)
             'aliases' => AliasResource::collection($this->whenLoaded('aliases')),
             'default_recipient' => new RecipientResource($this->whenLoaded('defaultRecipient')),
             'active' => $this->active,
+            'catch_all' => $this->catch_all,
             'domain_verified_at' => $this->domain_verified_at ? $this->domain_verified_at->toDateTimeString() : null,
             'domain_sending_verified_at' => $this->domain_sending_verified_at ? $this->domain_sending_verified_at->toDateTimeString() : null,
             'created_at' => $this->created_at->toDateTimeString(),

app/Models/Domain.php

@@ -24,7 +24,8 @@ class Domain extends Model
     protected $fillable = [
         'domain',
         'description',
-        'active'
+        'active',
+        'catch_all'
     ];
 
     protected $dates = [
@@ -38,6 +39,7 @@ class Domain extends Model
         'id' => 'string',
         'user_id' => 'string',
         'active' => 'boolean',
+        'catch_all' => 'boolean',
         'default_recipient_id' => 'string',
     ];
 
@@ -107,6 +109,22 @@ public function activate()
         $this->update(['active' => true]);
     }
 
+    /**
+     * Disable catch-all for the domain.
+     */
+    public function disableCatchAll()
+    {
+        $this->update(['catch_all' => false]);
+    }
+
+    /**
+     * Enable catch-all for the domain.
+     */
+    public function enableCatchAll()
+    {
+        $this->update(['catch_all' => true]);
+    }
+
     /**
      * Determine if the domain is verified.
      *

app/Rules/ValidAliasLocalPart.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+
+class ValidAliasLocalPart implements Rule
+{
+    /**
+     * Create a new rule instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string  $attribute
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return preg_match('/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))$/', $value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'Invalid alias local part.';
+    }
+}