diff --git a/web/app/Http/Controllers/Controller.php b/web/app/Http/Controllers/Controller.php index 8b067b8..bcd9c3a 100644 --- a/web/app/Http/Controllers/Controller.php +++ b/web/app/Http/Controllers/Controller.php @@ -38,17 +38,17 @@ class Controller extends BaseController $POST; - if (!isset($_POST['token'])) {return Response()->json(false);} + if (!isset($_COOKIE['gtok'])) {return Redirect('/login');} - $POST = $_POST['token']; + $POST = $_COOKIE['gtok']; $user = User::where('token', $POST)->first(); - if (!$user) {return Response()->json(false);} + if (!$user) {return Redirect('/login');} - setcookie('gtok', null, time()+(345600*30), "/", $_POST['host']); + setcookie('gtok', null, time()+(345600*30), "/", $_SERVER['HTTP_HOST']); - return Response()->json('good'); + return Redirect('/'); } diff --git a/web/resources/js/components/Navbar.js b/web/resources/js/components/Navbar.js index 9888500..e373441 100644 --- a/web/resources/js/components/Navbar.js +++ b/web/resources/js/components/Navbar.js @@ -55,6 +55,7 @@ const Navbar = (props) => { : Login / Sign up} diff --git a/web/resources/js/helpers/Auth.js b/web/resources/js/helpers/Auth.js index eac179e..71e0b37 100644 --- a/web/resources/js/helpers/Auth.js +++ b/web/resources/js/helpers/Auth.js @@ -53,3 +53,15 @@ export function LoginToAccount(form) { }); } + +export function LogoutOfAccount() { + + const body = form; + var badInputs = []; + + axios.post(`${protocol}apis.${url}/account/logout`, body, {headers: {'X-CSRF-TOKEN': document.querySelector(`meta[name="csrf-token"]`).content, "X-Requested-With":"XMLHttpRequest"}}).then(data=>{ + window.location.replace(`/`); + resolve("good"); + }).catch(error=>{console.log(error);}); + +} diff --git a/web/routes/apis.php b/web/routes/apis.php index b51446c..170555f 100644 --- a/web/routes/apis.php +++ b/web/routes/apis.php @@ -35,8 +35,6 @@ Route::post('/account/register', 'Auth\RegisterController@create'); Route::post('/account/login', 'Controller@login'); -Route::post('/account/logout', 'Controller@logout'); - Route::fallback(function(){ return response('{"errors":[{"code":404,"message":"NotFound"}]}', 404) ->header('Cache-Control', 'private') diff --git a/web/routes/web.php b/web/routes/web.php index 36bdf6e..dd583f5 100644 --- a/web/routes/web.php +++ b/web/routes/web.php @@ -52,3 +52,5 @@ Route::get('/legal/dmca', function(){ Route::get('/games', function(){ return view('main'); }); + +Route::get('/account/logout', 'Controller@logout');