fix: update data keys for compatibility with beta api

Author: ecmarsh

integration/fixtures/streamsql.min.js

@@ -30,8 +30,8 @@ describe('integration', () => {
     if (postData) {
       postData = JSON.parse(postData)
     }
-    expect(postData.streamName).toMatch('clickstream')
-    expect(postData.eventTimestamp).toBeGreaterThan(15e9)
+    expect(postData.stream).toMatch('clickstream')
+    expect(postData.data.timestamp).toBeGreaterThan(15e9)
   }, 10000)
 
   it('sends page context with url, title, and referrer', async () => {
@@ -42,7 +42,7 @@ describe('integration', () => {
     await page.goto(home)
     await page.click('button#count-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.context).toMatchObject({
+    expect(postData.data.context).toMatchObject({
       url: await page.url(),
       title: await page.title(),
       referrer: '',
@@ -51,7 +51,7 @@ describe('integration', () => {
     await Promise.all([page.waitForNavigation(), page.click('a')])
     await page.click('button#send-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.context).toMatchObject({
+    expect(postData.data.context).toMatchObject({
       url: await page.url(),
       title: await page.title(),
       referrer: expect.stringMatching(SERVER_URL),
@@ -108,27 +108,27 @@ describe('integration', () => {
     await page.type('input#user-input', userId)
     await page.click('button#login-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.user).toMatchObject({ id: userId })
+    expect(postData.data.user).toMatchObject({ id: userId })
     postData = undefined // reset for next page
 
     // visit the other page, should persist userId
     await Promise.all([page.waitForNavigation(), page.click('a')])
     await page.click('button#send-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.user).toMatchObject({ id: userId })
+    expect(postData.data.user).toMatchObject({ id: userId })
     postData = undefined
 
     // do logout, ensure logout sent event does NOT have user id
     await page.click('#logout-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.user).toMatchObject({ id: '' })
+    expect(postData.data.user).toMatchObject({ id: '' })
     postData = undefined
 
     // go back and send event from home page, should NOT have user id
     await page.goBack()
     await page.click('#count-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.user).toMatchObject({ id: '' })
+    expect(postData.data.user).toMatchObject({ id: '' })
   }, 20000)
 
   it('persists user id when coming back to site', async () => {
@@ -145,7 +145,7 @@ describe('integration', () => {
     await page.type('input#user-input', userId)
     await page.click('button#login-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.user).toMatchObject({ id: userId })
+    expect(postData.data.user).toMatchObject({ id: userId })
     postData = undefined // reset for next page
 
     // visit the other page, should persist userId
@@ -154,7 +154,7 @@ describe('integration', () => {
     await page.goto(alt)
     await page.click('button#send-button')
     postData = postData && JSON.parse(postData)
-    expect(postData.user).toMatchObject({ id: userId })
+    expect(postData.data.user).toMatchObject({ id: userId })
   }, 8000)
 
   it('calls template functions onIdentify and onUnidentify', async () => {

integration/index.umd.test.js

@@ -59,9 +59,8 @@ export default class StreamSQLClient implements CoreAPI {
     if (!this.pageCtx || !this.identifier) {
       this.throwNoInitError()
     }
-    return {
-      streamName: streamName.toLowerCase(),
-      eventTimestamp: new Date().getTime(),
+    const streamsqlData = {
+      timestamp: new Date().getTime(),
       context: {
         url: this.pageCtx.location(),
         referrer: this.pageCtx.referrer(),
@@ -71,7 +70,11 @@ export default class StreamSQLClient implements CoreAPI {
         id: this.identifier.getUser(),
         // FUTURE: ability to add other user props
       },
-      data: data || {}
+    }
+    const _data = data ? Object.assign({}, streamsqlData, data) : streamsqlData
+    return {
+      stream: streamName.toLowerCase(),
+      data: _data
     }
   }