{
+ this.generateAliasLoading = false
+ this.aliases.push(data.data)
+ this.reSort()
+ this.generateAliasModalOpen = false
+ this.success('New alias generated successfully')
+ })
+ .catch(error => {
+ this.generateAliasLoading = false
+ if (error.response.status === 429) {
+ this.error('You have reached your hourly limit for creating new aliases')
+ } else {
+ this.error()
+ }
+ })
+ },
editAlias(alias) {
if (this.aliasDescriptionToEdit.length > 100) {
return this.error('Description cannot be more than 100 characters')
diff --git a/resources/js/pages/Recipients.vue b/resources/js/pages/Recipients.vue
index dfe81b7..ffd41eb 100644
--- a/resources/js/pages/Recipients.vue
+++ b/resources/js/pages/Recipients.vue
@@ -79,7 +79,7 @@
:data-tippy-content="
`Use this to attach recipients to new aliases as they are created e.g. alias+key@${
user.username
- }.anonaddy.com. You can attach multiple recipients by doing alias+2.3@${
+ }.anonaddy.com. You can attach multiple recipients by doing alias+2.3.4@${
user.username
}.anonaddy.com`
"
diff --git a/routes/web.php b/routes/web.php
index 8df8de9..e304b5e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,6 +17,7 @@
Route::middleware(['auth', 'verified', '2fa'])->group(function () {
Route::get('/', 'AliasController@index')->name('aliases.index');
+ Route::post('/aliases', 'AliasController@store')->name('aliases.store');
Route::patch('/aliases/{id}', 'AliasController@update')->name('aliases.update');
Route::delete('/aliases/{id}', 'AliasController@destroy')->name('aliases.destroy');
diff --git a/tests/Feature/AliasesTest.php b/tests/Feature/AliasesTest.php
index 788e7e0..3ba6384 100644
--- a/tests/Feature/AliasesTest.php
+++ b/tests/Feature/AliasesTest.php
@@ -143,6 +143,16 @@ public function aliases_are_listed_with_only_verified_recipient_options()
$this->assertEquals($aliasRecipient->recipient->email, $response->data('recipients')[0]['email']);
}
+ /** @test */
+ public function user_can_generate_new_alias()
+ {
+ $response = $this->json('POST', '/aliases', []);
+
+ $response->assertStatus(200);
+ $this->assertCount(1, $this->user->aliases);
+ $this->assertEquals($this->user->aliases[0]->email, $response->getData()->data->email);
+ }
+
/** @test */
public function user_can_activate_alias()
{
diff --git a/tests/Feature/ReceiveEmailTest.php b/tests/Feature/ReceiveEmailTest.php
index 1695ed2..a50f208 100644
--- a/tests/Feature/ReceiveEmailTest.php
+++ b/tests/Feature/ReceiveEmailTest.php
@@ -247,6 +247,61 @@ public function it_can_forward_email_with_existing_alias()
});
}
+ /** @test */
+ public function it_can_forward_email_with_uuid_generated_alias()
+ {
+ Mail::fake();
+
+ Mail::assertNothingSent();
+
+ $uuid = '86064c92-da41-443e-a2bf-5a7b0247842f';
+
+ config([
+ 'anonaddy.admin_username' => 'random'
+ ]);
+
+ factory(Alias::class)->create([
+ 'id' => $uuid,
+ 'user_id' => $this->user->id,
+ 'email' => $uuid.'@anonaddy.me',
+ 'local_part' => $uuid,
+ 'domain' => 'anonaddy.me',
+ ]);
+
+ $defaultRecipient = $this->user->defaultRecipient;
+
+ $this->artisan(
+ 'anonaddy:receive-email',
+ [
+ 'file' => base_path('tests/emails/email_with_uuid.eml'),
+ '--sender' => 'will@anonaddy.com',
+ '--recipient' => [$uuid.'@anonaddy.me'],
+ '--local_part' => [$uuid],
+ '--extension' => [''],
+ '--domain' => ['anonaddy.me'],
+ '--size' => '892'
+ ]
+ )->assertExitCode(0);
+
+ $this->assertDatabaseHas('aliases', [
+ 'local_part' => $uuid,
+ 'domain' => 'anonaddy.me',
+ 'email' => $uuid.'@anonaddy.me',
+ 'emails_forwarded' => 1,
+ 'emails_blocked' => 0
+ ]);
+ $this->assertDatabaseHas('users', [
+ 'id' => $this->user->id,
+ 'username' => 'johndoe',
+ 'bandwidth' => '892'
+ ]);
+ $this->assertCount(1, $this->user->aliases);
+
+ Mail::assertQueued(ForwardEmail::class, function ($mail) use ($defaultRecipient) {
+ return $mail->hasTo($defaultRecipient->email);
+ });
+ }
+
/** @test */
public function it_can_forward_email_with_existing_alias_and_receipients()
{
diff --git a/tests/emails/email_with_uuid.eml b/tests/emails/email_with_uuid.eml
new file mode 100644
index 0000000..709afbf
--- /dev/null
+++ b/tests/emails/email_with_uuid.eml
@@ -0,0 +1,28 @@
+Date: Wed, 20 Feb 2019 15:00:00 +0100 (CET)
+From: Will
+To: <86064c92-da41-443e-a2bf-5a7b0247842f@anonaddy.me>
+Subject: Test Email
+Content-Type: multipart/mixed; boundary="----=_Part_10031_1199410393.1550677940425"
+
+------=_Part_10031_1199410393.1550677940425
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Hi,
+
+This is a test email.
+
+Will
+
+
+------=_Part_10031_1199410393.1550677940425
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Hi,
+
+This is a test email.
+
+Will
+
+------=_Part_10031_1199410393.1550677940425--