New middle ware for user activation.

app/Http/Controllers/Auth/ConfirmationController.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * ConfirmationController.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Http\Controllers\Auth;
+
+use Auth;
+use Config;
+use FireflyIII\Events\ResendConfirmation;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Preferences;
+use Session;
+
+/**
+ * Class ConfirmationController
+ *
+ * @package FireflyIII\Http\Controllers\Auth
+ */
+class ConfirmationController extends Controller
+{
+
+    /**
+     * @return mixed
+     */
+    public function confirmationError()
+    {
+        return view('auth.confirmation.error');
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return mixed
+     * @throws FireflyException
+     */
+    public function doConfirmation(string $code)
+    {
+        // check user_confirmed_last_mail
+
+        $database = Preferences::get('user_confirmed_code')->data;
+        $time     = Preferences::get('user_confirmed_last_mail', 0)->data;
+        $now      = time();
+        $maxDiff  = Config::get('firefly.confirmation_age');
+
+        if ($database === $code && ($now - $time <= $maxDiff)) {
+            Preferences::setForUser(Auth::user(), 'user_confirmed', true);
+            Preferences::setForUser(Auth::user(), 'user_confirmed_confirmed', time());
+            Session::flash('success', strval(trans('firefly.account_is_confirmed')));
+
+            return redirect(route('home'));
+        } else {
+            throw new FireflyException(trans('firefly.invalid_activation_code'));
+        }
+    }
+
+    /**
+     * @param Request $request
+     */
+    public function resendConfirmation(Request $request)
+    {
+        $time    = Preferences::get('user_confirmed_last_mail', 0)->data;
+        $now     = time();
+        $maxDiff = Config::get('firefly.resend_confirmation');
+        $owner   = env('SITE_OWNER', 'mail@example.com');
+        if ($now - $time > $maxDiff) {
+
+            event(new ResendConfirmation(Auth::user(), $request->ip()));
+
+            return view('auth.confirmation.resent', ['owner' => $owner]);
+        } else {
+            return view('auth.confirmation.no-resent', ['owner' => $owner]);
+        }
+    }
+
+}

app/Http/Kernel.php

@@ -7,6 +7,8 @@ use FireflyIII\Http\Middleware\Authenticate;
 use FireflyIII\Http\Middleware\AuthenticateTwoFactor;
 use FireflyIII\Http\Middleware\Binder;
 use FireflyIII\Http\Middleware\EncryptCookies;
+use FireflyIII\Http\Middleware\IsConfirmed;
+use FireflyIII\Http\Middleware\IsNotConfirmed;
 use FireflyIII\Http\Middleware\Range;
 use FireflyIII\Http\Middleware\RedirectIfAuthenticated;
 use FireflyIII\Http\Middleware\RedirectIfTwoFactorAuthenticated;
@@ -60,6 +62,17 @@ class Kernel extends HttpKernel
                 VerifyCsrfToken::class,
                 Authenticate::class,
                 AuthenticateTwoFactor::class,
+                IsConfirmed::class,
+            ],
+            'web-auth-no-confirm'    => [
+                EncryptCookies::class,
+                AddQueuedCookiesToResponse::class,
+                StartSession::class,
+                ShareErrorsFromSession::class,
+                VerifyCsrfToken::class,
+                Authenticate::class,
+                AuthenticateTwoFactor::class,
+                IsNotConfirmed::class,
             ],
             'web-auth-no-two-factor' => [
                 EncryptCookies::class,
@@ -69,6 +82,7 @@ class Kernel extends HttpKernel
                 VerifyCsrfToken::class,
                 Authenticate::class,
                 RedirectIfTwoFactorAuthenticated::class,
+                IsConfirmed::class,
             ],
             'web-auth-range'         => [
                 EncryptCookies::class,
@@ -78,6 +92,7 @@ class Kernel extends HttpKernel
                 VerifyCsrfToken::class,
                 Authenticate::class,
                 AuthenticateTwoFactor::class,
+                IsConfirmed::class,
                 Range::class,
                 Binder::class,
             ],

app/Http/Middleware/IsConfirmed.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * IsConfirmed.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Preferences;
+
+/**
+ * Class IsConfirmed
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class IsConfirmed
+{
+    /**
+     * Handle an incoming request. User account must be confirmed for this routine to let
+     * the user pass.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     * @param  string|null              $guard
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->guest()) {
+            if ($request->ajax()) {
+                return response('Unauthorized.', 401);
+            } else {
+                return redirect()->guest('login');
+            }
+        } else {
+            // user must be logged in, then continue:
+            $isConfirmed = Preferences::get('user_confirmed', false)->data;
+            if ($isConfirmed === false) {
+
+                // user account is not confirmed, redirect to
+                // confirmation page:
+                return redirect(route('confirmation_error'));
+            }
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/IsNotConfirmed.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * IsNotConfirmed.php
+ * Copyright (C) 2016 Sander Dorigo
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Preferences;
+
+/**
+ * Class IsNotConfirmed
+ *
+ * @package FireflyIII\Http\Middleware
+ */
+class IsNotConfirmed
+{
+    /**
+     * Handle an incoming request. User account must be confirmed for this routine to let
+     * the user pass.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     * @param  string|null              $guard
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->guest()) {
+            if ($request->ajax()) {
+                return response('Unauthorized.', 401);
+            } else {
+                return redirect()->guest('login');
+            }
+        } else {
+            // user must be logged in, then continue:
+            $isConfirmed = Preferences::get('user_confirmed', false)->data;
+            if ($isConfirmed) {
+                // user account is confirmed, simply send them home.
+                return redirect(route('home'));
+            }
+        }
+
+        return $next($request);
+    }
+}