fix google oauth error

Author: dannycoulombe

.env.example

@@ -1,7 +1,6 @@
 # General
 INTERFACE_EDITOR_URL=http://localhost:3000
 ACCESS_CONTROL_ALLOW_ORIGIN=http://localhost:3000
-PUBLIC_FILE_PATH=http://localhost:9200/private/files/
 JSONMS_CYPHER_KEY=urjMdK071cL935eKdczjEQ==
 
 # Database

.github/workflows/deploy-dev.yml

@@ -49,7 +49,7 @@ jobs:
             echo "JSONMS_CYPHER_KEY=${{ secrets.JSONMS_CYPHER_KEY }}" >> .env
             echo "GOOGLE_OAUTH_CLIENT_ID=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env
             echo "GOOGLE_OAUTH_CLIENT_SECRET=${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}" >> .env
-            echo "GOOGLE_OAUTH_CALLBACK_URL=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env
+            echo "GOOGLE_OAUTH_CALLBACK_URL=https://server.dev.json.ms/google/callback" >> .env
             echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env
             echo "DATABASE_DBNAME=${{ secrets.DATABASE_DEV_DBNAME }}" >> .env
             echo "DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}" >> .env

.github/workflows/deploy-prod.yml

@@ -49,7 +49,7 @@ jobs:
             echo "JSONMS_CYPHER_KEY=${{ secrets.JSONMS_CYPHER_KEY }}" >> .env
             echo "GOOGLE_OAUTH_CLIENT_ID=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env
             echo "GOOGLE_OAUTH_CLIENT_SECRET=${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}" >> .env
-            echo "GOOGLE_OAUTH_CALLBACK_URL=637442439591-qrrpb3v9d3n5m8b8gheorfa1fbi5o6qc.apps.googleusercontent.com" >> .env
+            echo "GOOGLE_OAUTH_CALLBACK_URL=https://server.json.ms/google/callback" >> .env
             echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env
             echo "DATABASE_DBNAME=${{ secrets.DATABASE_PROD_DBNAME }}" >> .env
             echo "DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }}" >> .env

src/controllers/SessionController.php

@@ -40,22 +40,26 @@ public function indexAction() {
         }
         else {
 
-            // Google Client Configuration
-            $client = new Google_Client();
-            $client->setClientId($_ENV['GOOGLE_OAUTH_CLIENT_ID']);
-            $client->setClientSecret($_ENV['GOOGLE_OAUTH_CLIENT_SECRET']);
-            $client->setRedirectUri($_ENV['GOOGLE_OAUTH_CALLBACK_URL']);
-            $client->addScope('email');
-            $client->addScope('profile');
-
-            $loginUrl = $client->createAuthUrl();
+            try {
+                // Google Client Configuration
+                $client = new Google_Client();
+                $client->setClientId($_ENV['GOOGLE_OAUTH_CLIENT_ID']);
+                $client->setClientSecret($_ENV['GOOGLE_OAUTH_CLIENT_SECRET']);
+                $client->setRedirectUri($_ENV['GOOGLE_OAUTH_CALLBACK_URL']);
+                $client->addScope('email');
+                $client->addScope('profile');
+                $loginUrl = $client->createAuthUrl();
+            } catch(\Exception $e) {
+                throwError(500, $e->getMessage());
+            }
 
             try {
                 $oauth2 = new Google_Service_Oauth2($client);
                 $oauth2->userinfo->get();
                 $loggedIn = true;
             } catch(\Exception $e) {
                 $this->responseJson([
+                    'error' => $e->getMessage(),
                     'loggedIn' => false,
                     'user' => $user,
                     'googleOAuthSignInUrl' => $loginUrl,