From 30307c1b56e3503a2ccec5ae82ce10436fc3edc6 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 11 Sep 2018 10:55:53 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=9D=B8?=
 =?UTF-8?q?=EC=A6=9D=20=EB=B2=84=EA=B7=B8=20=EC=B2=B4=ED=81=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_login.php                   | 2 +-
 oauth_kakao/j_login_oauth.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/j_login.php b/j_login.php
index 892cb8f4..7596489e 100644
--- a/j_login.php
+++ b/j_login.php
@@ -63,7 +63,7 @@ function kakaoOAuthCheck(array $userInfo) : ?array {
         $accessToken = $refreshResult['access_token']??null;
 
         if(!$accessToken){
-            trigger_error("refreshToken 에러 ".Json::encode($refreshResult), E_USER_NOTICE);
+            trigger_error("refreshToken 에러 ".Json::encode($refreshResult).",".$refreshToken, E_USER_NOTICE);
             return [false, '로그인 토큰 자동 갱신을 실패했습니다. 카카오 로그인을 수행해 주세요.'];
         }
         $accessTokenValidUntil = TimeUtil::DatetimeFromNowSecond($refreshResult['expires_in']);
diff --git a/oauth_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php
index 6f8d02e3..a8f914ad 100644
--- a/oauth_kakao/j_login_oauth.php
+++ b/oauth_kakao/j_login_oauth.php
@@ -155,9 +155,11 @@ if($userInfo['delete_after']){
 
 $oauthInfo = Json::decode($userInfo['oauth_info'])??[];
 $oauthInfo['accessToken'] = $access_token;
-$oauthInfo['refreshToken'] = $refresh_token;
 $oauthInfo['accessTokenValidUntil'] = $expires;
-$oauthInfo['refreshTokenValidUntil'] = $refresh_token_expires;
+if($refresh_token){
+    $oauthInfo['refreshToken'] = $refresh_token;
+    $oauthInfo['refreshTokenValidUntil'] = $refresh_token_expires;
+}
 
 RootDB::db()->update('member', [
     'oauth_info'=>Json::encode($oauthInfo)