Added attribution history to api requests via data attributes

- we added attribution data from localstorage to api requests made via Portal UI, but was missed for requests directly from theme via data-attributes
- includes url history data for free or paid signups via theme to mark correct attribution

ghost/portal/src/data-attributes.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 
-const {getQueryPrice} = require('./utils/helpers');
+import {getQueryPrice, getUrlHistory} from './utils/helpers';
 
 function formSubmitHandler({event, form, errorEl, siteUrl, submitHandler}) {
     form.removeEventListener('submit', submitHandler);
@@ -27,19 +27,24 @@ function formSubmitHandler({event, form, errorEl, siteUrl, submitHandler}) {
     }
 
     form.classList.add('loading');
+    const urlHistory = getUrlHistory();
+    const reqBody = {
+        email: email,
+        emailType: emailType,
+        labels: labels,
+        name: name,
+        autoRedirect: (autoRedirect === 'true')
+    };
+    if (urlHistory) {
+        reqBody.urlHistory = urlHistory;
+    }
 
     fetch(`${siteUrl}/members/api/send-magic-link/`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json'
         },
-        body: JSON.stringify({
+        body: JSON.stringify(reqBody)
-            email: email,
-            emailType: emailType,
-            labels: labels,
-            name: name,
-            autoRedirect: (autoRedirect === 'true')
-        })
     }).then(function (res) {
         form.addEventListener('submit', submitHandler);
         form.classList.remove('loading');
@@ -83,6 +88,12 @@ function planClickHandler({event, el, errorEl, siteUrl, site, member, clickHandl
     const metadata = member ? {
         checkoutType: 'upgrade'
     } : {};
+    const urlHistory = getUrlHistory();
+
+    if (urlHistory) {
+        metadata.urlHistory = urlHistory;
+    }
+
     return fetch(`${siteUrl}/members/api/session`, {
         credentials: 'same-origin'
     }).then(function (res) {

ghost/portal/src/tests/data-attributes.test.js

@@ -2,6 +2,7 @@ import App from '../App';
 import {site as FixturesSite, member as FixtureMember} from '../utils/test-fixtures';
 import {fireEvent, appRender, within} from '../utils/test-utils';
 import setupGhostApi from '../utils/api';
+import * as helpers from '../utils/helpers';
 const {formSubmitHandler, planClickHandler} = require('../data-attributes');
 
 // Mock data
@@ -114,6 +115,17 @@ describe('Member Data attributes:', () => {
             };
         });
 
+        // Mock url history method
+        jest.spyOn(helpers, 'getUrlHistory').mockImplementation(() => {
+            return [{
+                path: '/blog/',
+                refMedium: null,
+                refSource: 'ghost-explore',
+                refUrl: 'https://example.com/blog/',
+                time: 1611234567890
+            }];
+        });
+
         // Mock window.location
         let locationMock = jest.fn();
         delete window.location;
@@ -130,8 +142,21 @@ describe('Member Data attributes:', () => {
             formSubmitHandler({event, form, errorEl, siteUrl, submitHandler});
 
             expect(window.fetch).toHaveBeenCalledTimes(1);
-
+            const expectedBody = JSON.stringify({
-            expect(window.fetch).toHaveBeenCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: `{"email":"jamie@example.com","emailType":"signup","labels":["Gold"],"name":"Jamie Larsen","autoRedirect":${true}}`, headers: {'Content-Type': 'application/json'}, method: 'POST'});
+                email: 'jamie@example.com',
+                emailType: 'signup',
+                labels: ['Gold'],
+                name: 'Jamie Larsen',
+                autoRedirect: true,
+                urlHistory: [{
+                    path: '/blog/',
+                    refMedium: null,
+                    refSource: 'ghost-explore',
+                    refUrl: 'https://example.com/blog/',
+                    time: 1611234567890
+                }]
+            });
+            expect(window.fetch).toHaveBeenCalledWith('https://portal.localhost/members/api/send-magic-link/', {body: expectedBody, headers: {'Content-Type': 'application/json'}, method: 'POST'});
         });
     });
 
@@ -148,9 +173,24 @@ describe('Member Data attributes:', () => {
                     credentials: 'same-origin'
                 }
             );
+            const expectedBody = {
+                priceId: plan,
+                identity: 'session-identity',
+                successUrl: 'https://portal.localhost/success',
+                cancelUrl: 'https://portal.localhost/cancel',
+                metadata: {
+                    urlHistory: [{
+                        path: '/blog/',
+                        refMedium: null,
+                        refSource: 'ghost-explore',
+                        refUrl: 'https://example.com/blog/',
+                        time: 1611234567890
+                    }]
+                }
+            };
             expect(window.fetch).toHaveBeenNthCalledWith(2,
                 'https://portal.localhost/members/api/create-stripe-checkout-session/', {
-                    body: `{"priceId":"${plan}","identity":"session-identity","successUrl":"https://portal.localhost/success","cancelUrl":"https://portal.localhost/cancel","metadata":{}}`,
+                    body: JSON.stringify(expectedBody),
                     headers: {
                         'Content-Type': 'application/json'
                     },
@@ -171,8 +211,24 @@ describe('Member Data attributes:', () => {
             expect(window.fetch).toHaveBeenNthCalledWith(1, 'https://portal.localhost/members/api/session', {
                 credentials: 'same-origin'
             });
+            const expectedBody = {
+                priceId: plan,
+                identity: 'session-identity',
+                successUrl: 'https://portal.localhost/success',
+                cancelUrl: 'https://portal.localhost/cancel',
+                metadata: {
+                    checkoutType: 'upgrade',
+                    urlHistory: [{
+                        path: '/blog/',
+                        refMedium: null,
+                        refSource: 'ghost-explore',
+                        refUrl: 'https://example.com/blog/',
+                        time: 1611234567890
+                    }]
+                }
+            };
             expect(window.fetch).toHaveBeenNthCalledWith(2, 'https://portal.localhost/members/api/create-stripe-checkout-session/', {
-                body: `{"priceId":"${plan}","identity":"session-identity","successUrl":"https://portal.localhost/success","cancelUrl":"https://portal.localhost/cancel","metadata":{"checkoutType":"upgrade"}}`,
+                body: JSON.stringify(expectedBody),
                 headers: {
                     'Content-Type': 'application/json'
                 },