From a59fdf324a21d63814d489ee6b327f51e5faa73d Mon Sep 17 00:00:00 2001 From: Will Browning Date: Wed, 23 Oct 2019 13:47:19 +0100 Subject: [PATCH] Updated readme --- README.md | 8 ++++ .../ActiveAdditionalUsernameController.php | 2 +- .../Controllers/Api/ActiveAliasController.php | 2 +- .../Api/ActiveDomainController.php | 2 +- .../Api/EncryptedRecipientController.php | 2 +- app/Jobs/DeleteAccount.php | 1 + composer.json | 2 +- composer.lock | 46 +++++++++---------- .../passport/PersonalAccessTokens.vue | 3 +- tests/Feature/Api/AdditionalUsernamesTest.php | 4 +- tests/Feature/Api/AliasesTest.php | 4 +- tests/Feature/Api/DomainsTest.php | 4 +- tests/Feature/Api/RecipientsTest.php | 4 +- 13 files changed, 47 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 7486d56..293ae53 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,10 @@ Here are a few reasons I can think of: * Ability to add additional usernames to compartmentalise aliases * New features added regularly +#### **Is there a browser extension?** + +Yes there is an [open-source](https://github.com/anonaddy/browser-extension) browser extension available to download for [Firefox](https://addons.mozilla.org/en-GB/firefox/addon/anonaddy/) and [Chrome](https://chrome.google.com/webstore/detail/anonaddy/iadbdpnoknmbdeolbapdackdcogdmjpe) (also available on other chromium based browsers such as Brave and Vivaldi). You can use the extension to generate UUID aliases remotely. + #### **How do I add my own GPG/OpenPGP key for encryption?** On the recipients page you simply need to click "Add public key" and paste in your **public** key data. Now all emails forwarded to you will be encrypted with your key. You should also replace the subject line of forwarded messages in your account settings as this cannot be encrypted. @@ -166,6 +170,10 @@ Blocked emails do not count towards your bandwidth (e.g. an alias is inactive or If you get close to your limit you'll be sent an email letting you know. If you continue and go over your limit the server will start discarding emails until your bandwidth resets the next month. +#### **Can I login using an additional username?** + +You can add up to 3 additional usernames as a Pro user for a total of 4 (including the one you signed up with). You can currently only login with the one that you originally signed up with. + #### **I'm not receiving any emails, what's wrong?** Please make sure to add mailer@anonaddy.me to your address book and check your spam folder. Make sure to mark emails from us as safe if they turn up in spam. diff --git a/app/Http/Controllers/Api/ActiveAdditionalUsernameController.php b/app/Http/Controllers/Api/ActiveAdditionalUsernameController.php index f6eaba7..823de69 100644 --- a/app/Http/Controllers/Api/ActiveAdditionalUsernameController.php +++ b/app/Http/Controllers/Api/ActiveAdditionalUsernameController.php @@ -23,6 +23,6 @@ public function destroy($id) $username->deactivate(); - return new AdditionalUsernameResource($username); + return response('', 204); } } diff --git a/app/Http/Controllers/Api/ActiveAliasController.php b/app/Http/Controllers/Api/ActiveAliasController.php index 2ccfd1b..8cbd05f 100644 --- a/app/Http/Controllers/Api/ActiveAliasController.php +++ b/app/Http/Controllers/Api/ActiveAliasController.php @@ -23,6 +23,6 @@ public function destroy($id) $alias->deactivate(); - return new AliasResource($alias); + return response('', 204); } } diff --git a/app/Http/Controllers/Api/ActiveDomainController.php b/app/Http/Controllers/Api/ActiveDomainController.php index ebecf00..4faff56 100644 --- a/app/Http/Controllers/Api/ActiveDomainController.php +++ b/app/Http/Controllers/Api/ActiveDomainController.php @@ -23,6 +23,6 @@ public function destroy($id) $domain->deactivate(); - return new DomainResource($domain); + return response('', 204); } } diff --git a/app/Http/Controllers/Api/EncryptedRecipientController.php b/app/Http/Controllers/Api/EncryptedRecipientController.php index f7f2a64..8be18c6 100644 --- a/app/Http/Controllers/Api/EncryptedRecipientController.php +++ b/app/Http/Controllers/Api/EncryptedRecipientController.php @@ -23,6 +23,6 @@ public function destroy($id) $recipient->update(['should_encrypt' => false]); - return new RecipientResource($recipient); + return response('', 204); } } diff --git a/app/Jobs/DeleteAccount.php b/app/Jobs/DeleteAccount.php index 9883176..fac0e5b 100644 --- a/app/Jobs/DeleteAccount.php +++ b/app/Jobs/DeleteAccount.php @@ -40,6 +40,7 @@ public function handle() $this->user->recipients()->get()->each->delete(); // In order to fire deleting model event. $this->user->domains()->delete(); $this->user->additionalUsernames()->get()->each->delete(); // In order to fire deleting model event. + $this->user->tokens()->delete(); $this->user->delete(); } } diff --git a/composer.json b/composer.json index 4a41869..b3c2518 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "laravel/tinker": "^1.0", "mews/captcha": "^3.0.0", "php-mime-mail-parser/php-mime-mail-parser": "^5.0", - "pragmarx/google2fa-laravel": "1.0.1", + "pragmarx/google2fa-laravel": "^1.3", "predis/predis": "^1.1", "ramsey/uuid": "^3.8", "spatie/dns": "^1.4" diff --git a/composer.lock b/composer.lock index a057f42..df8e0bd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "846b20a027e54de27b2ec80f3f84770d", + "content-hash": "f9bf7ae62bdf033feb821f10fd8e9335", "packages": [ { "name": "bacon/bacon-qr-code", @@ -1854,16 +1854,16 @@ }, { "name": "nesbot/carbon", - "version": "2.25.2", + "version": "2.25.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f" + "reference": "d07636581795383e2fea2d711212d30f941f2039" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f", - "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d07636581795383e2fea2d711212d30f941f2039", + "reference": "d07636581795383e2fea2d711212d30f941f2039", "shasum": "" }, "require": { @@ -1917,7 +1917,7 @@ "datetime", "time" ], - "time": "2019-10-14T14:18:59+00:00" + "time": "2019-10-20T11:05:44+00:00" }, { "name": "nikic/php-parser", @@ -1972,16 +1972,16 @@ }, { "name": "opis/closure", - "version": "3.4.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7" + "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7", - "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7", + "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7", + "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7", "shasum": "" }, "require": { @@ -2029,7 +2029,7 @@ "serialization", "serialize" ], - "time": "2019-09-02T21:07:33+00:00" + "time": "2019-10-19T18:38:51+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -2364,16 +2364,16 @@ }, { "name": "pragmarx/google2fa", - "version": "v6.1.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa.git", - "reference": "0ea122e0d1ba197e867888a623059ae1a7fe43b6" + "reference": "0afb47f8a686bd203fe85a05bab85139f3c1971e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/0ea122e0d1ba197e867888a623059ae1a7fe43b6", - "reference": "0ea122e0d1ba197e867888a623059ae1a7fe43b6", + "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/0afb47f8a686bd203fe85a05bab85139f3c1971e", + "reference": "0afb47f8a686bd203fe85a05bab85139f3c1971e", "shasum": "" }, "require": { @@ -2416,20 +2416,20 @@ "Two Factor Authentication", "google2fa" ], - "time": "2019-09-23T18:30:35+00:00" + "time": "2019-10-21T17:49:22+00:00" }, { "name": "pragmarx/google2fa-laravel", - "version": "v1.0.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa-laravel.git", - "reference": "b5f5bc71dcc52c48720441bc01c701023bd82882" + "reference": "4ccc17dbf5ab5f752113cb6088a5afce5191309e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/b5f5bc71dcc52c48720441bc01c701023bd82882", - "reference": "b5f5bc71dcc52c48720441bc01c701023bd82882", + "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/4ccc17dbf5ab5f752113cb6088a5afce5191309e", + "reference": "4ccc17dbf5ab5f752113cb6088a5afce5191309e", "shasum": "" }, "require": { @@ -2438,8 +2438,8 @@ "pragmarx/google2fa-qrcode": "^1.0" }, "require-dev": { - "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*", - "phpunit/phpunit": "~5|~6|~7" + "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|4.*", + "phpunit/phpunit": "~5|~6|~7|~8" }, "suggest": { "bacon/bacon-qr-code": "Required to generate inline QR Codes.", @@ -2487,7 +2487,7 @@ "google2fa", "laravel" ], - "time": "2019-03-22T19:54:51+00:00" + "time": "2019-10-21T18:34:37+00:00" }, { "name": "pragmarx/google2fa-qrcode", diff --git a/resources/js/components/passport/PersonalAccessTokens.vue b/resources/js/components/passport/PersonalAccessTokens.vue index 727f585..e473aeb 100644 --- a/resources/js/components/passport/PersonalAccessTokens.vue +++ b/resources/js/components/passport/PersonalAccessTokens.vue @@ -32,7 +32,8 @@ >Chrome / Brave to generate UUID aliases. Simply paste the token generated below into the browser extension to - get started. Your API Access tokens are secret and should be treated like your password. + get started. Your API access tokens are secret and should be treated like your password. For + more information please see the API documentation.