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

Fix #1708 allow logged-in members to register device without re-submitting username and password

Browse source
This commit is contained in:
Kijin Sung 2021-06-19 21:19:40 +09:00
parent 90d09cf4d2
commit 2d913b2b1c
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,7 @@ class memberController extends member
/**
* Register device
*/
function procMemberRegisterDevice($member_srl = null)
function procMemberRegisterDevice($member_srl = null, $device_token = null)
{
Context::setResponseMethod('JSON');
@ -111,13 +111,26 @@ class memberController extends member
$allow_guest_device = config('push.allow_guest_device');
$user_id = Context::get('user_id');
$password = Context::get('password');
$device_token = Context::get('device_token');
$device_token = $device_token ?? Context::get('device_token');
$device_model = escape(Context::get('device_model'));
// Return an error when id and password doesn't exist
if(!$member_srl && !$user_id && !$allow_guest_device) return new BaseObject(-1, 'NULL_USER_ID');
if(!$member_srl && !$password && !$allow_guest_device) return new BaseObject(-1, 'NULL_PASSWORD');
if(!$device_token) return new BaseObject(-1, 'NULL_DEVICE_TOKEN');
if(!$member_srl && $this->user->member_srl)
{
$member_srl = $this->user->member_srl;
}
if(!$member_srl && !$user_id && !$allow_guest_device)
{
return new BaseObject(-1, 'NULL_USER_ID');
}
if(!$member_srl && !$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();