From ca97c6c8a451fdb2aaa3e98f0cfc26bb8c605aef Mon Sep 17 00:00:00 2001
From: Jeffrey Jen <yihungjen@gmail.com>
Date: Thu, 29 Sep 2016 12:01:41 +0000
Subject: [PATCH] Send deviceType key to push handler

---
 spec/ParsePushAdapter.spec.js | 23 ++++++++++++-----------
 src/PushAdapterUtils.js       |  1 +
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/spec/ParsePushAdapter.spec.js b/spec/ParsePushAdapter.spec.js
index 5ee4689..a8d6413 100644
--- a/spec/ParsePushAdapter.spec.js
+++ b/spec/ParsePushAdapter.spec.js
@@ -81,8 +81,8 @@ describe('ParsePushAdapter', () => {
     ];
 
     var deviceMap = ParsePushAdapter.classifyInstallations(installations, validPushTypes);
-    expect(deviceMap['android']).toEqual([makeDevice('androidToken')]);
-    expect(deviceMap['ios']).toEqual([makeDevice('iosToken')]);
+    expect(deviceMap['android']).toEqual([makeDevice('androidToken', 'android')]);
+    expect(deviceMap['ios']).toEqual([makeDevice('iosToken', 'ios')]);
     expect(deviceMap['win']).toBe(undefined);
     done();
   });
@@ -129,14 +129,14 @@ describe('ParsePushAdapter', () => {
     var args = androidSender.send.calls.first().args;
     expect(args[0]).toEqual(data);
     expect(args[1]).toEqual([
-      makeDevice('androidToken')
+      makeDevice('androidToken', 'android')
     ]);
     // Check ios sender
     expect(iosSender.send).toHaveBeenCalled();
     args = iosSender.send.calls.first().args;
     expect(args[0]).toEqual(data);
     expect(args[1]).toEqual([
-      makeDevice('iosToken')
+      makeDevice('iosToken', 'ios')
     ]);
     done();
   });
@@ -206,18 +206,18 @@ describe('ParsePushAdapter', () => {
     var args = androidSender.send.calls.first().args;
     expect(args[0]).toEqual(data);
     expect(args[1]).toEqual([
-      makeDevice('androidToken'),
-      makeDevice('androidToken'),
-      makeDevice('androidToken'),
-      makeDevice('androidToken')
+      makeDevice('androidToken', 'android'),
+      makeDevice('androidToken', 'android'),
+      makeDevice('androidToken', 'android'),
+      makeDevice('androidToken', 'android')
     ]);
     // Check ios sender
     expect(iosSender.send).toHaveBeenCalled();
     args = iosSender.send.calls.first().args;
     expect(args[0]).toEqual(data);
     expect(args[1]).toEqual([
-      makeDevice('iosToken'),
-      makeDevice('iosToken')
+      makeDevice('iosToken', 'ios'),
+      makeDevice('iosToken', 'ios')
     ]);
     done();
   });
@@ -281,9 +281,10 @@ describe('ParsePushAdapter', () => {
     })
   });
 
-  function makeDevice(deviceToken, appIdentifier) {
+  function makeDevice(deviceToken, deviceType, appIdentifier) {
     return {
       deviceToken: deviceToken,
+      deviceType: deviceType,
       appIdentifier: appIdentifier
     };
   }
diff --git a/src/PushAdapterUtils.js b/src/PushAdapterUtils.js
index f6a74d5..9abb1e8 100644
--- a/src/PushAdapterUtils.js
+++ b/src/PushAdapterUtils.js
@@ -21,6 +21,7 @@ export function classifyInstallations(installations, validPushTypes) {
     if (Array.isArray(devices)) {
       devices.push({
         deviceToken: installation.deviceToken,
+        deviceType: installation.deviceType,
         appIdentifier: installation.appIdentifier
       });
     }