Fix for #1002

app/Http/Controllers/AccountController.php

@@ -409,7 +409,7 @@ class AccountController extends Controller
      * and for each period, the amount of money spent and earned. This is a complex operation which is cached for
      * performance reasons.
      *
-     * @param Account $account The account involved.
+     * @param Account $account the account involved
      *
      * @return Collection
      *

app/Http/Controllers/Auth/LoginController.php

@@ -101,7 +101,7 @@ class LoginController extends Controller
         }
 
         // forget 2fa cookie:
-        $cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
+        $request->session()->forget('twoFactorAuthenticated');
 
         // is allowed to?
         $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
@@ -114,6 +114,7 @@ class LoginController extends Controller
         $email    = $request->old('email');
         $remember = $request->old('remember');
 
-        return view('auth.login', compact('allowRegistration', 'email', 'remember'))->withCookie($cookie);
+
+        return view('auth.login', compact('allowRegistration', 'email', 'remember'));//->withCookie($cookie);
     }
 }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -96,9 +96,9 @@ class TwoFactorController extends Controller
      */
     public function postIndex(TokenFormRequest $request, CookieJar $cookieJar)
     {
-        // set cookie!
+        // update session, not cookie:
-        $cookie = $cookieJar->forever('twoFactorAuthenticated', 'true');
+        $request->session()->put('twoFactorAuthenticated', true);
 
-        return redirect(route('home'))->withCookie($cookie);
+        return redirect(route('home'));
     }
 }

app/Http/Controllers/HomeController.php

@@ -94,7 +94,7 @@ class HomeController extends Controller
     {
         $phpVersion     = PHP_VERSION;
         $phpOs          = php_uname();
-        $interface      = php_sapi_name();
+        $interface      = PHP_SAPI;
         $now            = Carbon::create()->format('Y-m-d H:i:s e');
         $extensions     = join(', ', get_loaded_extensions());
         $drivers        = join(', ', DB::availableDrivers());

app/Http/Controllers/NewUserController.php

@@ -72,7 +72,6 @@ class NewUserController extends Controller
     /**
      * @param NewUserFormRequest          $request
      * @param AccountRepositoryInterface  $repository
-     *
      * @param CurrencyRepositoryInterface $currencyRepository
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

app/Http/Controllers/ProfileController.php

@@ -261,6 +261,7 @@ class ProfileController extends Controller
      * @param string $hash
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     *
      * @throws FireflyException
      */
     public function undoEmailChange(string $token, string $hash)

app/Http/Controllers/Transaction/MassController.php

@@ -133,9 +133,7 @@ class MassController extends Controller
         // skip transactions that have multiple destinations, multiple sources or are an opening balance.
         $filtered = new Collection;
         $messages = [];
-        /**
+        // @var TransactionJournal
-         * @var TransactionJournal
-         */
         foreach ($journals as $journal) {
             $sources      = $journal->sourceAccountList();
             $destinations = $journal->destinationAccountList();

app/Http/Middleware/AuthenticateTwoFactor.php

@@ -64,8 +64,8 @@ class AuthenticateTwoFactor
         $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
         $has2faSecret = null !== Preferences::get('twoFactorAuthSecret');
 
-        // grab 2auth information from cookie, not from session.
+        // grab 2auth information from session.
-        $is2faAuthed = 'true' === Cookie::get('twoFactorAuthenticated');
+        $is2faAuthed = true === $request->session()->get('twoFactorAuthenticated');
 
         if ($is2faEnabled && $has2faSecret && !$is2faAuthed) {
             Log::debug('Does not seem to be 2 factor authed, redirect.');

app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php

@@ -47,8 +47,8 @@ class RedirectIfTwoFactorAuthenticated
             $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
             $has2faSecret = null !== Preferences::get('twoFactorAuthSecret');
 
-            // grab 2auth information from cookie
+            // grab 2auth information from session.
-            $is2faAuthed = 'true' === Cookie::get('twoFactorAuthenticated');
+            $is2faAuthed = true === $request->session()->get('twoFactorAuthenticated');
 
             if ($is2faEnabled && $has2faSecret && $is2faAuthed) {
                 return redirect('/');