Refactoring GCM.

Author: rogerhu

spec/GCM.spec.js

@@ -1,4 +1,4 @@
-var GCM = require('../src/GCM');
+var GCM = require('../src/GCM').GCM;
 
 describe('GCM', () => {
   it('can initialize', (done) => {

spec/ParsePushAdapter.spec.js

@@ -1,6 +1,6 @@
 var ParsePushAdapter = require('../src/Adapters/Push/ParsePushAdapter');
 var APNS = require('../src/APNS');
-var GCM = require('../src/GCM');
+var GCM = require('../src/GCM').GCM;
 
 describe('ParsePushAdapter', () => {
   it('can be initialized', (done) => {

src/Adapters/Push/ParsePushAdapter.js

@@ -4,7 +4,7 @@
 // for ios push.
 
 const Parse = require('parse/node').Parse;
-const GCM = require('../../GCM');
+const GCM = require('../../GCM').GCM;
 const APNS = require('../../APNS');
 import PushAdapter from './PushAdapter';
 import { classifyInstallations } from './PushAdapterUtils';

src/GCM.js

@@ -7,7 +7,7 @@ const cryptoUtils = require('./cryptoUtils');
 const GCMTimeToLiveMax = 4 * 7 * 24 * 60 * 60; // GCM allows a max of 4 weeks
 const GCMRegistrationTokensMax = 1000;
 
-function GCM(args) {
+export function GCM(args) {
   if (typeof args !== 'object' || !args.apiKey) {
     throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
                           'GCM Configuration is invalid');
@@ -53,6 +53,10 @@ GCM.prototype.send = function(data, devices) {
   }
   // Generate gcm payload
   let gcmPayload = generateGCMPayload(data.data, timestamp, expirationTime);
+=======
+  // Generate gcm payload
+  let gcmPayload = generateGCMPayload(data.data, null, null, data.expirationTime);
+>>>>>>> Refactoring GCM.
   // Make and send gcm request
   let message = new gcm.Message(gcmPayload);
 
@@ -107,17 +111,21 @@ GCM.prototype.send = function(data, devices) {
  * @param {Number|undefined} expirationTime A number whose format is the Unix Epoch or undefined
  * @returns {Object} A promise which is resolved after we get results from gcm
  */
-function generateGCMPayload(coreData, timeStamp, expirationTime) {
+export function generateGCMPayload(coreData, timeStamp, expirationTime) {
+  timeStamp = timeStamp || Date.now();
+
   let payloadData =  {
     'time': new Date(timeStamp).toISOString(),
     'data': JSON.stringify(coreData)
   }
+
   let payload = {
     priority: 'normal',
     data: payloadData
   };
+
   if (expirationTime) {
-   // The timeStamp and expiration is in milliseconds but gcm requires second
+    // The timeStamp and expiration is in milliseconds but gcm requires second
     let timeToLive = Math.floor((expirationTime - timeStamp) / 1000);
     if (timeToLive < 0) {
       timeToLive = 0;
@@ -127,6 +135,7 @@ function generateGCMPayload(coreData, timeStamp, expirationTime) {
     }
     payload.timeToLive = timeToLive;
   }
+
   return payload;
 }
 
@@ -148,4 +157,3 @@ if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
   GCM.generateGCMPayload = generateGCMPayload;
   GCM.sliceDevices = sliceDevices;
 }
-module.exports = GCM;