Refactor GCM so it can be reused

More refactoring of GCM module.

Fix GCM refactor

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');
@@ -22,16 +22,9 @@ function GCM(args) {
  * @returns {Object} A promise which is resolved after we get results from gcm
  */
 GCM.prototype.send = function(data, devices) {
-  let pushId = cryptoUtils.newObjectId();
-  let timeStamp = Date.now();
-  let expirationTime;
-  // We handle the expiration_time convertion in push.js, so expiration_time is a valid date
-  // in Unix epoch time in milliseconds here
-  if (data['expiration_time']) {
-    expirationTime = data['expiration_time'];
-  }
   // Generate gcm payload
-  let gcmPayload = generateGCMPayload(data.data, pushId, timeStamp, expirationTime);
+  let gcmData = prepareGCMPayload();
+  let gcmPayload = generateGCMPayload(data.data, gcmData.pushId, gcmData.timeStamp, data.expirationTime);
   // Make and send gcm request
   let message = new gcm.Message(gcmPayload);
 
@@ -60,6 +53,17 @@ GCM.prototype.send = function(data, devices) {
   return Parse.Promise.when(sendPromises);
 }
 
+/**
+ * Generate default GCM payload data.
+ * @returns {Object} Push ID and timestamp
+ */
+export function prepareGCMPayload() {
+  let pushId = cryptoUtils.newObjectId();
+  let timeStamp = Date.now();
+
+  return {pushId: pushId, timeStamp: timeStamp};
+}
+
 /**
  * Generate the gcm payload from the data we get from api request.
  * @param {Object} coreData The data field under api request body
@@ -68,18 +72,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, pushId, timeStamp, expirationTime) {
+export function generateGCMPayload(coreData, pushId, timeStamp, expirationTime) {
+
   let payloadData =  {
     'time': new Date(timeStamp).toISOString(),
     'push_id': pushId,
     '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;
@@ -89,6 +96,7 @@ function generateGCMPayload(coreData, pushId, timeStamp, expirationTime) {
     }
     payload.timeToLive = timeToLive;
   }
+
   return payload;
 }
 
@@ -110,4 +118,4 @@ if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
   GCM.generateGCMPayload = generateGCMPayload;
   GCM.sliceDevices = sliceDevices;
 }
-module.exports = GCM;
+//module.exports = GCM;