3 seconds timeout when accessing Google API

Author: dannycoulombe

src/controllers/BaseController.php

@@ -90,6 +90,9 @@ public function getCurrentUserId() {
             }
             return null;
         }
+        if ($this->user == null) {
+            return null;
+        }
         return $this->user->id;
     }
 

src/controllers/SessionController.php

@@ -1,6 +1,7 @@
 <?php
 
 use JSONms\Controllers\RestfulController;
+use GuzzleHttp\Client as GuzzleClient;
 
 class SessionController extends RestfulController {
 
@@ -28,6 +29,29 @@ private function getEndpoints($userId) {
         return [];
     }
 
+    private function getLoginUrl() {
+
+        $httpClient = new GuzzleClient([
+            'timeout' => 3.0,
+            'connect_timeout' => 3.0,
+        ]);
+
+        try {
+            // Google Client Configuration
+            $client = new Google_Client();
+            $client->setHttpClient($httpClient);
+            $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');
+
+            return $client->createAuthUrl();
+        } catch(\Exception $e) {
+            throwError(500, $e->getMessage());
+        }
+    }
+
     public function indexAction() {
 
         $loggedIn = isset($_SESSION['access_token']) && $_SESSION['access_token'];
@@ -54,53 +78,11 @@ public function indexAction() {
                 // User exists, fetch data
                 $user = $stmt->fetch(PDO::FETCH_OBJ);
             } 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();
+               $loginUrl = $this->getLoginUrl();
             }
         }
         else {
-            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,
-                    'structures' => $structures,
-                    'endpoints' => $endpoints,
-                ]);
-            }
-
-            // Check if user already exists
-            $stmt = $this->query('get-user-by-google-id', [
-                'id' => $this->getCurrentUserId(),
-            ]);
-
-            if ($stmt->rowCount() > 0) {
-                $user = $stmt->fetch(PDO::FETCH_OBJ);
-            }
+            $loginUrl = $this->getLoginUrl();
         }
 
         if ($loggedIn && isset($user)) {