devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: oauth_kakao에서 누락된 userID 반영

Browse Source
This commit is contained in:
Hide_D
2022-03-13 13:46:13 +09:00
parent 41234fd502
commit e15f964f81
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth_kakao/j_login_oauth.php
+9 -7
View File
@@ -138,12 +138,13 @@ if (!$userInfo) {
'aux' => $session->tmpx, 'aux' => $session->tmpx,
]); ]);
} }
$userID = $userInfo['no'];
if ($userInfo['delete_after']) { if ($userInfo['delete_after']) {
if ($userInfo['delete_after'] < $now) { if ($userInfo['delete_after'] < $now) {
$restAPI->unlink(); $restAPI->unlink();
$session->access_token = null; $session->access_token = null;
$RootDB->delete('member', 'no=%i', $userInfo['no']); $RootDB->delete('member', 'no=%i', $userID);
Json::die([ Json::die([
'result' => false, 'result' => false,
'reqOTP' => false, 'reqOTP' => false,
@@ -170,20 +171,20 @@ if ($refresh_token) {
RootDB::db()->update('member', [ RootDB::db()->update('member', [
'oauth_info' => Json::encode($oauthInfo) 'oauth_info' => Json::encode($oauthInfo)
], 'no=%i', $userInfo['no']); ], 'no=%i', $userID);
$tokenValidUntil = $userInfo['token_valid_until']; $tokenValidUntil = $userInfo['token_valid_until'];
if (!$tokenValidUntil || $tokenValidUntil < $now) { if (!$tokenValidUntil || $tokenValidUntil < $now) {
if (!createOTPbyUserNO($userInfo['no'])) { if (!createOTPbyUserNO($userID)) {
Json::die([ Json::die([
'result' => false, 'result' => false,
'reqOTP' => false, 'reqOTP' => false,
'reason' => '인증 코드를 보내는데 실패했습니다.' 'reason' => '인증 코드를 보내는데 실패했습니다.'
]); ]);
} }
$session->login($userInfo['no'], $userInfo['id'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}')); $session->login($userID, $userInfo['id'], $userInfo['grade'], true, $userInfo['token_valid_until'], null, Json::decode($userInfo['acl'] ?? '{}'));
Json::die([ Json::die([
'result' => false, 'result' => false,
'reqOTP' => true, 'reqOTP' => true,
@@ -192,8 +193,9 @@ if (!$tokenValidUntil || $tokenValidUntil < $now) {
} }
$RootDB->insert('member_log', [ $RootDB->insert('member_log', [
'member_no' => $userInfo['no'], 'member_no' => $userID,
'action_type' => 'login', 'action_type' => 'login',
'action' => Json::encode([ 'action' => Json::encode([
'ip' => Util::get_client_ip(true), 'ip' => Util::get_client_ip(true),
@@ -225,7 +227,7 @@ $RootDB->query(
); );
$token = Util::randomStr(20); $token = Util::randomStr(20);
$RootDB->insert('login_token', [ $RootDB->insert('login_token', [
'user_id' => $userInfo['no'], 'user_id' => $userID,
'base_token' => $token, 'base_token' => $token,
'reg_ip' => Util::get_client_ip(true), 'reg_ip' => Util::get_client_ip(true),
'reg_date' => $nowDate, 'reg_date' => $nowDate,
@@ -233,7 +235,7 @@ $RootDB->insert('login_token', [
]); ]);
$tokenID = $RootDB->insertId(); $tokenID = $RootDB->insertId();
$session->login($userInfo['no'], $userInfo['id'], $userInfo['grade'], false, $userInfo['token_valid_until'], $tokenID, Json::decode($userInfo['acl'] ?? '{}')); $session->login($userID, $userInfo['id'], $userInfo['grade'], false, $userInfo['token_valid_until'], $tokenID, Json::decode($userInfo['acl'] ?? '{}'));