From c05a43f3b1195c06d48908bb112bce99b4a52b47 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 9 Sep 2022 03:28:18 +0900
Subject: [PATCH] =?UTF-8?q?fix(oauth):=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20oauthID=EB=A5=BC=20=EB=B0=9B?=
 =?UTF-8?q?=EC=95=84=EC=98=A4=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=B6=84=EA=B8=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oauth_kakao/j_login_oauth.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/oauth_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php
index 86057161..8fa6e0b7 100644
--- a/oauth_kakao/j_login_oauth.php
+++ b/oauth_kakao/j_login_oauth.php
@@ -78,6 +78,7 @@ if ($expires < $now) {
 }
 
 
+$oauthID = null;
 if (!$email) {
     $me = $restAPI->meWithEmail();
     $me['code'] = Util::array_get($me['code'], 0);
@@ -88,6 +89,7 @@ if (!$email) {
             'reason' => '카카오로그인이 정상적으로 수행되지 않았습니다.'
         ]);
     }
+    $oauthID = $me['id'];
 
     $kakao_account = $me['kakao_account'] ?? null;
     if (!$kakao_account) {
@@ -129,7 +131,17 @@ $userInfo = $RootDB->queryFirstRow(
 );
 
 if (!$userInfo) {
-    $oauthID = $me['id'];
+    if(!$oauthID){
+        $me = $restAPI->meWithEmail();
+        if ($me['code']??0 < 0) {
+            Json::die([
+                'result' => false,
+                'reqOTP' => false,
+                'reason' => '카카오로그인이 정상적으로 수행되지 않았습니다.'
+            ]);
+        }
+        $oauthID = $me['id'];
+    }
     //이메일 계정이 바뀐 것인가?
     $userInfo = $RootDB->queryFirstRow(
         'SELECT `no`, `id`, `name`, `grade`, `delete_after`, `acl`, oauth_info, token_valid_until from member where oauth_id=%i',