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

알림 기능 구현FCM은 테스트 완료

Browse source
This commit is contained in:
choyeon 2020-06-22 14:34:35 +09:00
parent 07e28b4ef9
commit 347152e163
9 changed files with 127 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,10 +100,6 @@ class memberController extends member
$browserInfo = Rhymix\Framework\UA::getBrowserInfo();
$device_type = strtolower($browserInfo->os);
if('android' !== $device_type && 'ios' !== $device_type)
{
return new BaseObject(-1, 'NOT_SUPPORTED_OS');
}
if('ios' === $device_type)
{
@ -134,7 +130,7 @@ class memberController extends member
$logged_info = Context::get('logged_info');
$random_key = Rhymix\Framework\Security::getRandom();
$device_key = hash_hmac('sha256', $random_key, $device_token);
$device_key = hash_hmac('sha256', $random_key, $logged_info->member_srl . ':' . config('crypto.authentication_key'));
// Start transaction
$oDB = DB::getInstance();
@ -179,8 +175,8 @@ class memberController extends member
Context::setResponseMethod('JSON');
// Check member_srl, device_token, device_key
$member_srl = Context::get('member_srl');
$device_token = escape(Context::get('device_token'));
$random_key = escape(Context::get('device_key'));
$device_token = Context::get('device_token');
$random_key = Context::get('device_key');
// Return an error when id, password and device_key doesn't exist
if(!$member_srl) return new BaseObject(-1, 'NULL_MEMBER_SRL');
@ -190,7 +186,7 @@ class memberController extends member
$args = new stdClass;
$args->member_srl = $member_srl;
$args->device_token = $device_token;
$args->device_key = hash_hmac('sha256', $random_key, $device_token);
$args->device_key = hash_hmac('sha256', $random_key, $member_srl . ':' . config('crypto.authentication_key'));
$output = executeQueryArray('member.getMemberDevice', $args);
if(!$output->toBool())
{

10
modules/member/queries/deleteMemberDevice.xml Normal file
View file

@ -0,0 +1,10 @@
<query id="deleteMemberDevice" action="delete">
<tables>
<table name="member_devices" />
</tables>
<conditions>
<condition operation="in" column="device_srl" var="device_srl" />
<condition operation="in" column="member_srl" var="member_srl" pipe="and" />
<condition operation="in" column="device_token" var="device_token" pipe="and" />
</conditions>
</query>

11
modules/member/queries/updateMemberDevice.xml Normal file
View file

@ -0,0 +1,11 @@
<query id="updateMemberDevice" action="update">
<tables>
<table name="member_devices" />
</tables>
<columns>
<column name="device_token" var="new_token" notnull="notnull" />
</columns>
<conditions>
<condition operation="equal" column="device_token" var="old_token" notnull="notnull" />
</conditions>
</query>

1
modules/ncenterlite/ncenterlite.controller.php
View file

@ -1514,7 +1514,6 @@ class ncenterliteController extends ncenterlite
$oPush = new \Rhymix\Framework\Push();
$oPush->setSubject($content);
$oPush->setContent($args->extra_content);
$oPush->setImage($args->extra_image);
$oPush->setData($args->extra_data);
$oPush->setURL($target_url);
$oPush->addTo($args->member_srl);