CHANGE_GOOGLE_OAUTH_ROUTE
This commit is contained in:
parent
0c20d4ddd6
commit
86912e956c
@ -10,6 +10,7 @@ $routes->get('/test', 'Home::test');
|
||||
$routes->get('/login', 'LoginController::index');///auth/google
|
||||
$routes->get('/logout', 'LoginController::logout');
|
||||
$routes->get('/oauth2callback', 'LoginController::receiveGoogleOAuthResponse');
|
||||
$routes->get('/auth/google', 'LoginController::initiateGoogleOAuth');
|
||||
|
||||
|
||||
$routes->group("/user", ["filter" => "authMVC"], function($routes){
|
||||
|
||||
@ -57,4 +57,12 @@ abstract class BaseController extends Controller
|
||||
|
||||
$this->session = \Config\Services::session();
|
||||
}
|
||||
|
||||
|
||||
public function loadLayout($view_name,$data)
|
||||
{
|
||||
echo view('layout/header',$data);
|
||||
echo view($view_name, $data);
|
||||
echo view('layout/footer',$data);
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,6 +80,8 @@ class ClientController extends AdminController
|
||||
echo view('layout/header');
|
||||
echo view('client_onboarding', $data);
|
||||
echo view('layout/footer');
|
||||
|
||||
// $this->loadLayout('client_onboarding', $data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -61,11 +61,16 @@ class LoginController extends BaseController
|
||||
}
|
||||
|
||||
}else{
|
||||
$return = googleOAuthLogin(false);
|
||||
return $return;
|
||||
|
||||
return redirect()->to(base_url('login'));
|
||||
}
|
||||
}
|
||||
|
||||
public function initiateGoogleOAuth()
|
||||
{
|
||||
return googleOAuthLogin(false);
|
||||
}
|
||||
|
||||
public function logout()
|
||||
{
|
||||
session()->destroy();
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group mb-0 text-center">
|
||||
<a href="<?= base_url('/LoginController/receiveGoogleOAuthResponse'); ?>"><img
|
||||
<a href="<?= base_url('auth/google'); ?>"><img
|
||||
src="<?= base_url()."public"; ?>/assets/images/googleButton.svg" width="300"></a>
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user