From aa9af45207bedf974c0a0b60335b952c69e92e89 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 24 Nov 2021 16:14:33 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20device=20tok?=
 =?UTF-8?q?en=EA=B3=BC=20device=20key=EB=A5=BC=20=ED=97=A4=EB=8D=94?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A3=BC=EA=B3=A0=EB=B0=9B=EC=9D=84=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=A7=80=EC=9B=90=20(#1325=20?=
 =?UTF-8?q?=EB=B3=B4=EC=99=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

요청 헤더: X-Device-Token
응답 헤더: X-Registered-Member-Srl, X-Registered-Device-Key
---
 modules/member/member.controller.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 10d98eeac..81873742b 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -71,7 +71,7 @@ class memberController extends member
 		executeQuery('member.deleteAuthMail', $args);
 		
 		// If a device token is supplied, attempt to register it.
-		$device_token = Context::get('device_token');
+		$device_token = Context::get('device_token') ?? ($_SERVER['HTTP_X_DEVICE_TOKEN'] ?? null);
 		if ($device_token)
 		{
 			$output = executeQuery('member.getMemberDevice', ['device_token' => $device_token]);
@@ -82,6 +82,12 @@ class memberController extends member
 				{
 					return $output;
 				}
+				$device_key = $this->get('device_key');
+				if ($device_key)
+				{
+					header('X-Registered-Member-Srl: ' . $member_info->member_srl);
+					header('X-Registered-Device-Key: ' . $device_key);
+				}
 			}
 			else
 			{
@@ -995,13 +1001,23 @@ class memberController extends member
 		}
 		
 		// Register device
-		$device_token = Context::get('device_token');
+		$device_token = Context::get('device_token') ?? ($_SERVER['HTTP_X_DEVICE_TOKEN'] ?? null);
 		if ($device_token)
 		{
 			$output = executeQuery('member.getMemberDevice', ['device_token' => $device_token]);
 			if (!$output->data || $output->data->member_srl != $args->member_srl)
 			{
-				$this->procMemberRegisterDevice($args->member_srl);
+				$output = $this->procMemberRegisterDevice($args->member_srl);
+				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);
+				}
 			}
 		}