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

$_SESSION 으로 직접 접근하는 코드들을 모두 Session 클래스로 통합

Browse Source
This commit is contained in:
Hide_D
2018-04-05 02:04:43 +09:00
parent b3e621fbfd
commit 51316abd42
61 changed files with 177 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth_kakao/j_change_pw.php
+9 -12
View File
@@ -7,18 +7,15 @@ use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
$nowDate = TimeUtil::DatetimeNow();
$session = Session::Instance();
if(!$session->isLoggedIn()){
Json::die([
'result'=>false,
'reason'=>'로그인이 되어있지 않습니다'
]);
}
$session = Session::requireLogin([
'reason'=>'로그인이 되어있지 않습니다'
]);
$userID = $session->userID;
$access_token = Util::array_get($_SESSION['access_token']);
$expires = Util::array_get($_SESSION['expires']);
$refresh_token = Util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = Util::array_get($_SESSION['refresh_token_expires']);
$access_token = $session->access_token;
$expires = $session->expires;
$refresh_token = $session->refresh_token;
$refresh_token_expires = $session->refresh_token_expires;
if(!$access_token || !$expires){
Json::die([
@@ -39,7 +36,7 @@ if($expires < $nowDate && (!$refresh_token || ($refresh_token_expires < $nowDate
}
if($expires < $nowDate){
unset($_SESSION['kaccount_email']);
$session->kaccount_email = null;
$email = null;
$result = $restAPI->refresh_access_token($refresh_token);
oauth_kakao/j_check_dup.php
+2 -4
View File
@@ -5,11 +5,9 @@ require(__dir__.'/../vendor/autoload.php');
require('lib.join.php');
$session = Session::Instance()->setReadOnly();
session_start();
$access_token = Util::array_get($_SESSION['access_token']);
$access_token = $session->access_token;
if(!$access_token){
Json::die('로그인 토큰 에러. 다시 로그인을 수행해주세요.');
}
oauth_kakao/j_join_process.php
+8 -8
View File
@@ -6,7 +6,7 @@ require('lib.join.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
session_start();
$session = Session::Instance();
$canJoin = RootDB::db()->queryFirstField('SELECT REG FROM `SYSTEM` WHERE `NO` = 1');
if($canJoin != 'Y'){
@@ -18,10 +18,10 @@ if($canJoin != 'Y'){
$nowDate = TimeUtil::DatetimeNow();
$access_token = Util::array_get($_SESSION['access_token']);
$expires = Util::array_get($_SESSION['expires']);
$refresh_token = Util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = Util::array_get($_SESSION['refresh_token_expires']);
$access_token = Util::array_get($session->access_token);
$expires = Util::array_get($session->expires);
$refresh_token = Util::array_get($session->refresh_token);
$refresh_token_expires = Util::array_get($session->refresh_token_expires);
if(!$access_token){
Json::die([
'result'=>false,
@@ -29,7 +29,7 @@ if(!$access_token){
]);
}
if($expires < $nowDate && (!$refresh_token || ($refresh_token_expires < $nowDate))){
unset($_SESSION['access_token']);
$session->access_token = null;
Json::die([
'result'=>false,
'reason'=>'로그인 토큰 만료.'.$refresh_token_expires.' 다시 카카오로그인을 수행해주세요.'
@@ -86,7 +86,7 @@ $restAPI = new Kakao_REST_API_Helper($access_token);
if($expires < $nowDate){
$result = $restAPI->refresh_access_token($refresh_token);
if(!isset($refresh_token)){
unset($_SESSION['access_token']);
$session->access_token = null;
Json::die([
'result'=>false,
'reason'=>'카카오 로그인 과정 중 추가 갱신 절차를 실패했습니다'
@@ -131,7 +131,7 @@ if(!Util::array_get($me['kaccount_email_verified'],false)){
}
$email = $me['kaccount_email'];
$_SESSION['kaccount_email'] = $email;
$session->kaccount_email = $email;
$emailChk = checkEmailDup($email);
if($emailChk !== true){
$restAPI->unlink();
oauth_kakao/j_login_oauth.php
+10 -10
View File
@@ -22,11 +22,11 @@ if($canLogin != 'Y'){
$nowDate = TimeUtil::DatetimeNow();
$access_token = Util::array_get($_SESSION['access_token']);
$expires = Util::array_get($_SESSION['expires']);
$refresh_token = Util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = Util::array_get($_SESSION['refresh_token_expires']);
$email = Util::array_get($_SESSION['kaccount_email']);
$access_token = $session->access_token;
$expires = $session->expires;
$refresh_token = $session->refresh_token;
$refresh_token_expires = $session->refresh_token_expires;
$email = $session->kaccount_email;
if(!$access_token || !$expires){
@@ -47,7 +47,7 @@ if($expires < $nowDate && (!$refresh_token || ($refresh_token_expires < $nowDate
}
if($expires < $nowDate){
unset($_SESSION['kaccount_email']);
$session->kaccount_email = null;
$email = null;
$result = $restAPI->refresh_access_token($refresh_token);
@@ -86,7 +86,7 @@ if(!$email){
}
$email = $me['kaccount_email'];
$_SESSION['kaccount_email'] = $email;
$session->kaccount_email = $email;
}
@@ -95,7 +95,7 @@ $userInfo = $RootDB->queryFirstRow(
if(!$userInfo){
$restAPI->unlink();
unset($_SESSION['access_token']);
$session->access_token = null;
Json::die([
'result'=>false,
'reason'=>'카카오로그인에 해당하는 계정이 없습니다. 재 가입을 시도해주세요.'
@@ -105,7 +105,7 @@ if(!$userInfo){
if($userInfo['delete_after']){
if($userInfo['delete_after'] < $nowDate){
$restAPI->unlink();
unset($_SESSION['access_token']);
$session->access_token = null;
$RootDB->delete('member', 'no=%i', $userInfo['no']);
Json::die([
'result'=>false,
@@ -114,7 +114,7 @@ if($userInfo['delete_after']){
}
else{
$restAPI->unlink();
unset($_SESSION['access_token']);
$session->access_token = null;
Json::die([
'result'=>false,
'reason'=>"삭제 요청된 계정입니다.[{$userInfo['delete_after']}]"
oauth_kakao/oauth.php
+12 -12
View File
@@ -26,20 +26,20 @@ $result = $restAPI->create_access_token($auth_code);
if(Util::array_get($result['expires_in'], -1) > 0){
session_start();
$restAPI->set_access_token($result['access_token']);
$now = TimeUtil::DatetimeNow();
$_SESSION['access_token'] = $result['access_token'];
$_SESSION['expires'] = TimeUtil::DatetimeFromSecond($now, $result['expires_in']);
$_SESSION['refresh_token'] = Util::array_get($result['refresh_token']);
$_SESSION['refresh_token_expires'] = TimeUtil::DatetimeFromSecond($now, $result['refresh_token_expires_in']);
}
else{
if (Util::array_get($result['expires_in'], -1) <= 0) {
die('알 수 없는 에러:'.$me['msg']);
}
$_SESSION['tmpx'] = Json::encode($result);
$session = Session::Instance();
$restAPI->set_access_token($result['access_token']);
$now = TimeUtil::DatetimeNow();
$session->access_token = $result['access_token'];
$session->expires = TimeUtil::DatetimeFromSecond($now, $result['expires_in']);
$session->refresh_token = Util::array_get($result['refresh_token']);
$session->refresh_token_expires = TimeUtil::DatetimeFromSecond($now, $result['refresh_token_expires_in']);
$session->tmpx = Json::encode($result);
//echo "<br>\n";
$me = $restAPI->meWithEmail();
@@ -57,7 +57,7 @@ if($me['code']< 0){
}
}
else{
$_SESSION['kaccount_email'] = $me['kaccount_email'];
$session->kaccount_email = $me['kaccount_email'];
}
?>