Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions app/app/BaseUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Support\Facades\Cookie;

class BaseUser
{
Expand Down Expand Up @@ -57,6 +58,27 @@ public static function authenticate(string $email, string $password)
*/
public static function isSignedIn()
{
if (!Session::has('email'))
{
if (isset($_COOKIE['email']))
{
$email = Cookie::get('email');
$password = Cookie::get('password');
if (BaseUser::authenticate((string) $email, (string) $password)==true)
{
Session::put('email', $email);
return Session::has('email');
}
else
{
$cookie = Cookie::forget('email');
Cookie::queue($cookie);
$cookie = Cookie::forget('password');
Cookie::queue($cookie);
}

}
}
return Session::has('email');
}

Expand Down
17 changes: 15 additions & 2 deletions app/app/Http/Controllers/SignInController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cookie;

class SignInController extends \Illuminate\Routing\Controller {

Expand All @@ -27,6 +29,7 @@ public function showForm(Request $request)
'confirmmessage' => '', 'message' => $message, 'after_signin_redirect' => $after_signin_redirect]);
}


/**
* Handle an authentication attempt.
*
Expand All @@ -43,6 +46,7 @@ public function authenticate(Request $request)
if (!$validator->fails())
{
$email = $request->input('email');
$password = $request->input('password');
if (BaseUser::authenticate($email, $request->input('password')))
{
if(!BaseUser::checkEmail($email))
Expand All @@ -51,6 +55,12 @@ public function authenticate(Request $request)
if (Input::has('after_signin_redirect')) {
return redirect()->intended($request->input('after_signin_redirect'));
}
$remember = $request->input('remember');
if ($remember)
{
return redirect()->intended('profile')->withCookie(cookie('email', $email, 24*7*60))->withCookie(cookie('password', $password, 24*7*60));

}
return redirect()->intended('profile');
}
else
Expand All @@ -62,10 +72,13 @@ public function authenticate(Request $request)
return Redirect::to('signin')->withErrors($validator)->withInput();
}


public function signout(Request $request)
{
BaseUser::signout();
AnswerRepository::destroyUncommittedChanges();
return redirect()->intended('/');
$cookie = Cookie::forget('email');
$cookie1 = Cookie::forget('password');
return redirect()->intended('/')->withCookie($cookie)->withCookie($cookie1);
}
}
}
4 changes: 2 additions & 2 deletions app/config/session.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
|
*/

'lifetime' => 120,
'lifetime' => 60*24*7,

'expire_on_close' => false,
'expire_on_close' => true,

/*
|--------------------------------------------------------------------------
Expand Down
Loading