fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 03:52:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

헤더 또는 쿠키로 device token과 device key를 주고받을 수 있도록 허용하고, 중복 코드 정리 (#1325 보완)

Browse source 
요청 헤더: X-Device-Token
응답 헤더: X-Device-Key (포맷: member_srl:device_key)

요청 쿠키: device_token
응답 쿠키: device_key (포맷: member_srl:device_key) (유효기간 1분)
This commit is contained in:
Kijin Sung 2021-11-26 01:52:15 +09:00
parent aa9af45207
commit 42442aeef7
1 changed files with 62 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

84
modules/member/member.controller.php
View file

@ -71,23 +71,18 @@ class memberController extends member
executeQuery('member.deleteAuthMail', $args); executeQuery('member.deleteAuthMail', $args);
// If a device token is supplied, attempt to register it. // If a device token is supplied, attempt to register it.
$device_token = Context::get('device_token') ?? ($_SERVER['HTTP_X_DEVICE_TOKEN'] ?? null); $device_token = $this->_getDeviceToken();
if ($device_token) if ($device_token)
{ {
$output = executeQuery('member.getMemberDevice', ['device_token' => $device_token]); $output = executeQuery('member.getMemberDevice', ['device_token' => $device_token]);
if (!$output->data || $output->data->member_srl != $member_info->member_srl) if (!$output->data || $output->data->member_srl != $member_info->member_srl)
{ {
$output = $this->procMemberRegisterDevice($member_info->member_srl); $output = $this->procMemberRegisterDevice($member_info->member_srl, $device_token);
if ($output instanceof BaseObject && !$output->toBool()) if ($output instanceof BaseObject && !$output->toBool())
{ {
return $output; return $output;
} }
$device_key = $this->get('device_key'); $this->_setDeviceKey();
if ($device_key)
{
header('X-Registered-Member-Srl: ' . $member_info->member_srl);
header('X-Registered-Device-Key: ' . $device_key);
}
} }
else else
{ {
@ -288,6 +283,60 @@ class memberController extends member
$this->add('nick_name', $member_info ? $member_info->nick_name : null); $this->add('nick_name', $member_info ? $member_info->nick_name : null);
} }
/**
* Get device token from POST parameter, HTTP header or cookie
*
* @return string|null
*/
protected function _getDeviceToken()
{
// POST parameter named device_token
$device_token = Context::get('device_token');
if ($device_token && $_SERVER['REQUEST_METHOD'] === 'POST')
{
return $device_token;
}
// HTTP header named X-Device-Token
$device_token = $_SERVER['HTTP_X_DEVICE_TOKEN'] ?? null;
if ($device_token)
{
return $device_token;
}
// Cookie named device_token
$device_token = $_COOKIE['device_token'] ?? null;
if ($device_token)
{
return $device_token;
}
}
/**
* Set device key via header or cookie
*
* @return void
*/
protected function _setDeviceKey()
{
$member_srl = $this->get('member_srl');
$device_key = $this->get('device_key');
if (!$member_srl || !$device_key)
{
return;
}
// Set header if header was given, or cookie otherwise
if (isset($_SERVER['HTTP_X_DEVICE_TOKEN']))
{
header('X-Device-Key: ' . urlencode($member_srl . ':' . $device_key));
}
else
{
setcookie('device_key', $member_srl . ':' . $device_key, time() + 60, \RX_BASEURL, null, !!config('session.use_ssl_cookies'), true);
}
}
/** /**
* Log-out * Log-out
* *
@ -1001,24 +1050,15 @@ class memberController extends member
} }
// Register device // Register device
$device_token = Context::get('device_token') ?? ($_SERVER['HTTP_X_DEVICE_TOKEN'] ?? null); $device_token = $this->_getDeviceToken();
if ($device_token) if ($device_token)
{ {
$output = executeQuery('member.getMemberDevice', ['device_token' => $device_token]); $output = $this->procMemberRegisterDevice($args->member_srl, $device_token);
if (!$output->data || $output->data->member_srl != $args->member_srl) if ($output instanceof BaseObject && !$output->toBool())
{ {
$output = $this->procMemberRegisterDevice($args->member_srl); return $output;
if ($output instanceof BaseObject && !$output->toBool())
{
return $output;
}
$device_key = $this->get('device_key');
if ($device_key)
{
header('X-Registered-Member-Srl: ' . $args->member_srl);
header('X-Registered-Device-Key: ' . $device_key);
}
} }
$this->_setDeviceKey();
} }
// Results // Results