Added default alias domain option

digineer · Feb 28, 2020 · 50bbc9d · 50bbc9d
1 parent a61368b
commit 50bbc9d
Show file tree

Hide file tree

Showing 16 changed files with 251 additions and 56 deletions.
diff --git a/app/Console/Commands/ReceiveEmail.php b/app/Console/Commands/ReceiveEmail.php
@@ -129,7 +129,7 @@ public function handle()
                 $this->checkRateLimit($user);
 
                 // Check whether this email is a reply/send from or a new email to be forwarded.
-                if (filter_var(Str::replaceLast('=', '@', $recipient['extension']), FILTER_VALIDATE_EMAIL)) {
+                if (filter_var(Str::replaceLast('=', '@', $recipient['extension']), FILTER_VALIDATE_EMAIL) && $user->isVerifiedRecipient($this->option('sender'))) {
                     if ($this->parser->getHeader('In-Reply-To')) {
                         $this->handleReply($user, $recipient);
                     } else {
@@ -161,7 +161,7 @@ protected function handleReply($user, $recipient)
     {
         $alias = $user->aliases()->where('email', $recipient['local_part'] . '@' . $recipient['domain'])->first();
 
-        if ($alias && $user->isVerifiedRecipient($this->option('sender'))) {
+        if ($alias) {
             $sendTo = Str::replaceLast('=', '@', $recipient['extension']);
 
             $emailData = new EmailData($this->parser);
@@ -188,7 +188,7 @@ protected function handleSendFrom($user, $recipient, $aliasable)
         ]);
 
         // This is a new alias but at a shared domain or the sender is not a verified recipient.
-        if ((!isset($alias->id) && in_array($recipient['domain'], config('anonaddy.all_domains'))) || !$user->isVerifiedRecipient($this->option('sender'))) {
+        if (!isset($alias->id) && in_array($recipient['domain'], config('anonaddy.all_domains'))) {
             exit(0);
         }
 

diff --git a/app/Http/Controllers/Api/DomainOptionController.php b/app/Http/Controllers/Api/DomainOptionController.php
@@ -9,7 +9,8 @@ class DomainOptionController extends Controller
     public function index()
     {
         return response()->json([
-            'data' => user()->domainOptions()
+            'data' => user()->domainOptions(),
+            'defaultAliasDomain' => user()->default_alias_domain
         ]);
     }
 }
diff --git a/app/Http/Controllers/DefaultAliasDomainController.php b/app/Http/Controllers/DefaultAliasDomainController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\UpdateDefaultAliasDomainRequest;
+
+class DefaultAliasDomainController extends Controller
+{
+    public function update(UpdateDefaultAliasDomainRequest $request)
+    {
+        user()->default_alias_domain = $request->domain;
+        user()->save();
+
+        return back()->with(['status' => 'Default Alias Domain Updated Successfully']);
+    }
+}
diff --git a/app/Http/Controllers/ShowAliasController.php b/app/Http/Controllers/ShowAliasController.php
@@ -15,7 +15,8 @@ public function index()
             'totalReplies' => user()->totalEmailsReplied(),
             'domain' => user()->username.'.'.config('anonaddy.domain'),
             'bandwidthMb' => user()->bandwidth_mb,
-            'domainOptions' => user()->domainOptions()
+            'domainOptions' => user()->domainOptions(),
+            'defaultAliasDomain' => user()->default_alias_domain
         ]);
     }
 }
diff --git a/app/Http/Requests/UpdateDefaultAliasDomainRequest.php b/app/Http/Requests/UpdateDefaultAliasDomainRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class UpdateDefaultAliasDomainRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'domain' => [
+                'required',
+                'string',
+                Rule::in($this->user()->domainOptions())
+            ]
+        ];
+    }
+}
diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2020_02_28_111536_add_default_alias_domain_to_users_table.php b/database/migrations/2020_02_28_111536_add_default_alias_domain_to_users_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDefaultAliasDomainToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('default_alias_domain')->after('default_recipient_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('default_alias_domain');
+        });
+    }
+}