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

fix: 로그인 시 세션에 저장되는 username을 id가 아니라 name값으로 변경

Browse Source
This commit is contained in:
Hide_D
2024-09-28 13:03:00 +00:00
parent 61bdb8da01
commit f774a28e2a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth_kakao/j_login_oauth.php
+2 -2
View File
@@ -211,7 +211,7 @@ if (!$tokenValidUntil || $tokenValidUntil < $now) {
'reason' => '인증 코드를 보내는데 실패했습니다.' '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([ Json::die([
'result' => false, 'result' => false,
'reqOTP' => true, 'reqOTP' => true,
@@ -262,7 +262,7 @@ $RootDB->insert('login_token', [
]); ]);
$tokenID = $RootDB->insertId(); $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'] ?? '{}'));
src/sammo/API/Login/LoginByID.php
+2 -2
View File
@@ -140,7 +140,7 @@ class LoginByID extends \sammo\BaseAPI
if ($userInfo['oauth_type'] == 'KAKAO') { if ($userInfo['oauth_type'] == 'KAKAO') {
$oauthFailResult = KakaoUtil::kakaoOAuthCheck($userInfo); $oauthFailResult = KakaoUtil::kakaoOAuthCheck($userInfo);
if ($oauthFailResult !== null) { 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; [$oauthReqOTP, $oauthFailReason] = $oauthFailResult;
return [ return [
'result' => false, 'result' => false,
@@ -153,7 +153,7 @@ class LoginByID extends \sammo\BaseAPI
$this->scrubToken($userInfo['no']); $this->scrubToken($userInfo['no']);
$nextToken = $this->addToken($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 [ return [
src/sammo/API/Login/LoginByToken.php
+2 -2
View File
@@ -115,7 +115,7 @@ class LoginByToken extends LoginByID
if ($userInfo['oauth_type'] == 'KAKAO') { if ($userInfo['oauth_type'] == 'KAKAO') {
$oauthFailResult = KakaoUtil::kakaoOAuthCheck($userInfo); $oauthFailResult = KakaoUtil::kakaoOAuthCheck($userInfo);
if ($oauthFailResult !== null) { 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; [$oauthReqOTP, $oauthFailReason] = $oauthFailResult;
$RootDB->delete( $RootDB->delete(
'login_token', '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']); $this->scrubToken($userInfo['no']);
$nextDate = TimeUtil::nowAddDays(2); $nextDate = TimeUtil::nowAddDays(2);