From f774a28e2a52ce93dc0afa96179b9c9ab7c923be Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sat, 28 Sep 2024 13:03:00 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C?=
 =?UTF-8?q?=20=EC=84=B8=EC=85=98=EC=97=90=20=EC=A0=80=EC=9E=A5=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20username=EC=9D=84=20id=EA=B0=80=20=EC=95=84?=
 =?UTF-8?q?=EB=8B=88=EB=9D=BC=20name=EA=B0=92=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oauth_kakao/j_login_oauth.php        | 4 ++--
 src/sammo/API/Login/LoginByID.php    | 4 ++--
 src/sammo/API/Login/LoginByToken.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oauth_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php
index 8fa6e0b7..2612696e 100644
--- a/oauth_kakao/j_login_oauth.php
+++ b/oauth_kakao/j_login_oauth.php
@@ -211,7 +211,7 @@ if (!$tokenValidUntil || $tokenValidUntil < $now) {
             'reason' => '인증 코드를 보내는데 실패했습니다.'
         ]);
     }
-    $session->login($userID, $userInfo['id'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}'));
+    $session->login($userID, $userInfo['name'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}'));
     Json::die([
         'result' => false,
         'reqOTP' => true,
@@ -262,7 +262,7 @@ $RootDB->insert('login_token', [
 ]);
 $tokenID = $RootDB->insertId();
 
-$session->login($userID, $userInfo['id'], $userInfo['grade'], false, $userInfo['token_valid_until'], $tokenID, Json::decode($userInfo['acl'] ?? '{}'));
+$session->login($userID, $userInfo['name'], $userInfo['grade'], false, $userInfo['token_valid_until'], $tokenID, Json::decode($userInfo['acl'] ?? '{}'));
 
 
 
diff --git a/src/sammo/API/Login/LoginByID.php b/src/sammo/API/Login/LoginByID.php
index c88f9d6b..b5b94bca 100644
--- a/src/sammo/API/Login/LoginByID.php
+++ b/src/sammo/API/Login/LoginByID.php
@@ -140,7 +140,7 @@ class LoginByID extends \sammo\BaseAPI
         if ($userInfo['oauth_type'] == 'KAKAO') {
             $oauthFailResult = KakaoUtil::kakaoOAuthCheck($userInfo);
             if ($oauthFailResult !== null) {
-                $session->login($userInfo['no'], $userInfo['id'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}'));
+                $session->login($userInfo['no'], $userInfo['name'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}'));
                 [$oauthReqOTP, $oauthFailReason] = $oauthFailResult;
                 return [
                     'result' => false,
@@ -153,7 +153,7 @@ class LoginByID extends \sammo\BaseAPI
         $this->scrubToken($userInfo['no']);
         $nextToken = $this->addToken($userInfo['no']);
 
-        $session->login($userInfo['no'], $userInfo['id'], $userInfo['grade'], false, $userInfo['token_valid_until'], $nextToken[0], Json::decode($userInfo['acl'] ?? '{}'));
+        $session->login($userInfo['no'], $userInfo['name'], $userInfo['grade'], false, $userInfo['token_valid_until'], $nextToken[0], Json::decode($userInfo['acl'] ?? '{}'));
 
 
         return [
diff --git a/src/sammo/API/Login/LoginByToken.php b/src/sammo/API/Login/LoginByToken.php
index 43385c9b..3c2130fc 100644
--- a/src/sammo/API/Login/LoginByToken.php
+++ b/src/sammo/API/Login/LoginByToken.php
@@ -115,7 +115,7 @@ class LoginByToken extends LoginByID
         if ($userInfo['oauth_type'] == 'KAKAO') {
             $oauthFailResult = KakaoUtil::kakaoOAuthCheck($userInfo);
             if ($oauthFailResult !== null) {
-                $session->login($userInfo['no'], $userInfo['id'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}'));
+                $session->login($userInfo['no'], $userInfo['name'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}'));
                 [$oauthReqOTP, $oauthFailReason] = $oauthFailResult;
                 $RootDB->delete(
                     'login_token',
@@ -125,7 +125,7 @@ class LoginByToken extends LoginByID
             }
         }
 
-        $session->login($userInfo['no'], $userInfo['id'], $userInfo['grade'], false, $userInfo['token_valid_until'], $token_id, Json::decode($userInfo['acl'] ?? '{}'));
+        $session->login($userInfo['no'], $userInfo['name'], $userInfo['grade'], false, $userInfo['token_valid_until'], $token_id, Json::decode($userInfo['acl'] ?? '{}'));
         $this->scrubToken($userInfo['no']);
 
         $nextDate = TimeUtil::nowAddDays(2);