From 86912e956c1563e815e8effb8572a779eea61f06 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Sat, 10 Feb 2024 12:04:45 +0530
Subject: [PATCH] CHANGE_GOOGLE_OAUTH_ROUTE

---
 app/Config/Routes.php                | 1 +
 app/Controllers/BaseController.php   | 8 ++++++++
 app/Controllers/ClientController.php | 2 ++
 app/Controllers/LoginController.php  | 9 +++++++--
 app/Views/login.php                  | 2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 5049587b..6686ef12 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -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){
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index c53dc7bb..f8e87392 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -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);
+    }
 }
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index ad7f6633..f56c0d36 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -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);
     }    
      
     
diff --git a/app/Controllers/LoginController.php b/app/Controllers/LoginController.php
index 78f239bd..f536fac9 100644
--- a/app/Controllers/LoginController.php
+++ b/app/Controllers/LoginController.php
@@ -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();
diff --git a/app/Views/login.php b/app/Views/login.php
index 8c83725a..b71b9373 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -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>