diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 05b0bf5a2a..fadb4029dc 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -5,7 +5,6 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Role; use FireflyIII\User; use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers; -use Illuminate\Foundation\Auth\ThrottlesLogins; use Illuminate\Http\Request; use Illuminate\Mail\Message; use Mail; @@ -32,54 +31,7 @@ class AuthController extends Controller | */ - /** - * Handle a login request to the application. - * - * @param \Illuminate\Http\Request $request - * - * @return \Illuminate\Http\Response - */ - public function postLogin(Request $request) - { - $this->validate( - $request, [ - $this->loginUsername() => 'required', 'password' => 'required', - ] - ); - - // If the class is using the ThrottlesLogins trait, we can automatically throttle - // the login attempts for this application. We'll key this by the username and - // the IP address of the client making these requests into this application. - $throttles = $this->isUsingThrottlesLoginsTrait(); - - if ($throttles && $this->hasTooManyLoginAttempts($request)) { - return $this->sendLockoutResponse($request); - } - - $credentials = $this->getCredentials($request); - $credentials['blocked'] = 0; - - if (Auth::attempt($credentials, $request->has('remember'))) { - return $this->handleUserWasAuthenticated($request, $throttles); - } - - // If the login attempt was unsuccessful we will increment the number of attempts - // to login and redirect the user back to the login form. Of course, when this - // user surpasses their maximum number of attempts they will get locked out. - if ($throttles) { - $this->incrementLoginAttempts($request); - } - - return redirect($this->loginPath()) - ->withInput($request->only($this->loginUsername(), 'remember')) - ->withErrors( - [ - $this->loginUsername() => $this->getFailedLoginMessage(), - ] - ); - } - - use AuthenticatesAndRegistersUsers, ThrottlesLogins; + use AuthenticatesAndRegistersUsers; public $redirectTo = '/'; diff --git a/config/session.php b/config/session.php index 6052e79df5..466d9ba843 100644 --- a/config/session.php +++ b/config/session.php @@ -16,7 +16,7 @@ return [ | */ - 'driver' => env('SESSION_DRIVER', 'database'), + 'driver' => env('SESSION_DRIVER', 'file'), /* |-------------------------------------------------------------------------- @@ -44,7 +44,7 @@ return [ | */ - 'encrypt' => true, + 'encrypt' => false, /* |-------------------------------------------------------------------------- @@ -70,7 +70,7 @@ return [ | */ - 'connection' => env('DB_CONNECTION', 'mysql'), + 'connection' => null, /* |-------------------------------------------------------------------------- @@ -109,7 +109,7 @@ return [ | */ - 'cookie' => 'firefly_session', + 'cookie' => 'laravel_session', /* |-------------------------------------------------------------------------- diff --git a/database/migrations/2015_07_14_202720_changes_for_v349.php b/database/migrations/2015_07_14_202720_changes_for_v349.php deleted file mode 100644 index 2cd99ab8c4..0000000000 --- a/database/migrations/2015_07_14_202720_changes_for_v349.php +++ /dev/null @@ -1,35 +0,0 @@ -boolean('blocked')->default(0); - } - ); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - } -}