diff --git a/app/Libraries/MySocket/GoogleLibrary.php b/app/Libraries/MySocket/GoogleLibrary.php index 0a77b3b..6bcf590 100644 --- a/app/Libraries/MySocket/GoogleLibrary.php +++ b/app/Libraries/MySocket/GoogleLibrary.php @@ -18,9 +18,9 @@ class GoogleLibrary extends WebLibrary if (is_null($this->_client)) { // $this->_client = new \Google_Client(); $this->_client = new \GuzzleHttp\Client(); - $this->_client->setClientId(getenv("google.client.id")); - $this->_client->setClientSecret(getenv("google.client.key")); - $this->_client->setRedirectUri(base_url() . getenv("google.client.callback_url")); + $this->_client->setClientId(getenv("socket.google.client.id")); + $this->_client->setClientSecret(getenv("socket.google.client.key")); + $this->_client->setRedirectUri(base_url() . getenv("socket.google.client.callback_url")); $this->_client->addScope('email'); $this->_client->addScope('profile'); } @@ -46,14 +46,14 @@ class GoogleLibrary extends WebLibrary if (isset($tokenInfo['error'])) { throw new \Exception($tokenInfo['error']); } - $token = $tokenInfo[getenv("google.client.token_name")]; + $token = $tokenInfo[getenv("socket.google.client.token_name")]; //3. Google Service에 접근하기위해 Access Token을 설정 $this->getClient()->setAccessToken($token); //4. Google에 로그인이 했으므로 세션에 Token값 설정 - $this->_session->set(getenv("google.client.token_name"), $token); + $this->_session->set(getenv("socket.google.client.token_name"), $token); } public function getAccessToken(): ?string { - return $this->_session->get(getenv("google.client.token_name")); + return $this->_session->get(getenv("socket.google.client.token_name")); } } diff --git a/app/Libraries/MySocket/WebLibrary.php b/app/Libraries/MySocket/WebLibrary.php index 3648be0..ccd2c30 100644 --- a/app/Libraries/MySocket/WebLibrary.php +++ b/app/Libraries/MySocket/WebLibrary.php @@ -46,6 +46,7 @@ class WebLibrary extends MySocketLibrary //기본 $options = [ 'cookies' => $this->getCookieJar(), + 'timeout' => getenv("socket.web.timeout"), // 5초 안에 응답이 없으면 타임아웃 ]; switch ($type) { case 'agent':