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

Separate device type (android/ios) from token type (fcm/apns)

Browse source 
애플 기기에서도 FCM을 사용하여 푸시알림을 구현할 수 있으므로
디바이스의 운영체제와 무관하게 토큰 타입을 지정하도록 변경합니다.
기존에 등록된 토큰은 운영체제 및 포맷에 따라 자동 변환합니다.
This commit is contained in:
Kijin Sung 2020-10-28 00:37:55 +09:00
parent 61f6456b6c
commit ed7add6d9c
6 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class memberController extends member
$args = new stdClass();
$args->member_srl = $member_info->member_srl;
executeQuery('member.deleteAuthMail', $args);
if(!$config->after_login_url)
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
@ -99,6 +99,7 @@ class memberController extends member
if(!$password && !$allow_guest_device) return new BaseObject(-1, 'NULL_PASSWORD');
if(!$device_token) return new BaseObject(-1, 'NULL_DEVICE_TOKEN');
// Get device information
$browserInfo = Rhymix\Framework\UA::getBrowserInfo();
$device_type = strtolower($browserInfo->os);
$device_version = $browserInfo->os_version;
@ -107,23 +108,18 @@ class memberController extends member
$device_model = escape($browserInfo->device);
}
if('ios' === $device_type)
// Detect device token type
if (preg_match('/^[0-9a-z]{64}$/', $device_token))
{
if(!preg_match("/^[0-9a-z]{64}$/", $device_token))
{
return new BaseObject(-1, 'INVALID_DEVICE_TOKEN');
}
$device_token_type = 'apns';
}
elseif('android' === $device_type)
elseif (preg_match('/^[0-9a-zA-Z:_-]+$/', $device_token) && strlen($device_token) > 64)
{
if(!preg_match("/^[0-9a-zA-Z:_-]+$/", $device_token))
{
return new BaseObject(-1, 'INVALID_DEVICE_TOKEN');
}
$device_token_type = 'fcm';
}
else
{
return new BaseObject(-1, 'NOT_SUPPORTED_OS');
return new BaseObject(-1, 'INVALID_DEVICE_TOKEN');
}
if($user_id && $password)
@ -151,6 +147,7 @@ class memberController extends member
$args->device_srl = getNextSequence();
$args->member_srl = $member_srl;
$args->device_token = $device_token;
$args->device_token_type = $device_token_type;
$args->device_key = $device_key;
$args->device_type = $device_type;
$args->device_version = $device_version;