Browse Source

Merge pull request #2387 from pixelfed/staging

@dansup Update email confirmation middleware, add 2FA to allow list. Fixes #2385
daniel 4 years ago
parent
commit
cd3d7149db
2 changed files with 2 additions and 0 deletions
  1. 1 0
      CHANGELOG.md
  2. 1 0
      app/Http/Middleware/EmailVerificationCheck.php

+ 1 - 0
CHANGELOG.md

@@ -88,6 +88,7 @@
 - Updated status embed, allow photo albums. Fixes ([#2374](https://github.com/pixelfed/pixelfed/issues/2374)). ([d11fac0d](https://github.com/pixelfed/pixelfed/commit/d11fac0d))
 - Updated DiscoverController, fixes ([#2378](https://github.com/pixelfed/pixelfed/issues/2378)). ([8e7f4f9d](https://github.com/pixelfed/pixelfed/commit/8e7f4f9d))
 - Updated SearchController, update version. ([8d923d77](https://github.com/pixelfed/pixelfed/commit/8d923d77))
+- Updated email confirmation middleware, add 2FA to allow list. Fixes ([#2385](https://github.com/pixelfed/pixelfed/issues/2385)). ([27f3b29c](https://github.com/pixelfed/pixelfed/commit/27f3b29c))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added

+ 1 - 0
app/Http/Middleware/EmailVerificationCheck.php

@@ -20,6 +20,7 @@ class EmailVerificationCheck
             config('pixelfed.enforce_email_verification') &&
             is_null($request->user()->email_verified_at) &&
             !$request->is(
+                'i/auth/*',
                 'i/verify-email', 
                 'log*', 
                 'i/confirm-email/*',