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