ghost 6.2.0 → 6.3.1

package/core/built/admin/index.html

@@ -6,7 +6,7 @@
     <title>Ghost</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.2%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2213355f26c2%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22d668621a75%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22cf5b4df358%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22f5dea8dc06%22%2C%22adminXActivitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.3%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2274f827c663%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f69553e153%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22bae67bc277%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%223dadbc8059%22%2C%22adminXActivitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D" />
 
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1, minimal-ui, viewport-fit=cover" />
     <meta name="pinterest" content="nopin" />
@@ -28,7 +28,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-49475952d56ffe89bd47ab9d9c64ada8.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-8ade80412a20088a4f0a9a1159f0bdba.css" title="light">
 
     
 </head>
@@ -48,8 +48,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-aed0068cf9b67d042dd23a6343545b7b.js"></script>
-<script src="assets/chunk.397.d5e25bb9baf088f52499.js"></script>
-<script src="assets/chunk.524.70595796c7b8c6003a2d.js"></script>
-    <script src="assets/ghost-2066304fd0b166e1c16d397dd73ef7b2.js"></script>
+<script src="assets/chunk.397.a720333cfffc99c47e71.js"></script>
+<script src="assets/chunk.524.5ac0aa6b2e0374d43fa1.js"></script>
+    <script src="assets/ghost-1bfab97cb7f550726e894fae6650a808.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -64,7 +64,8 @@ function getMembersHelper(data, frontendKey, excludeList) {
             key: frontendKey,
             api: urlUtils.urlFor('api', {type: 'content'}, true),
             locale: settingsCache.get('locale') || 'en',
-            'members-signin-otc': labs.isSet('membersSigninOTC') // html.dataset converts dash-attrs to camelCase
+            'members-signin-otc': labs.isSet('membersSigninOTC'), // html.dataset converts dash-attrs to camelCase
+            'members-signin-otc-alpha': labs.isSet('membersSigninOTCAlpha') // html.dataset converts dash-attrs to camelCase
         };
         if (colorString) {
             attributes['accent-color'] = colorString;

package/core/server/api/endpoints/stats.js

@@ -514,7 +514,7 @@ const controller = {
         },
         options: [
             'order',
-            'limit', 
+            'limit',
             'date_from',
             'date_to',
             'timezone',
@@ -541,6 +541,42 @@ const controller = {
         async query(frame) {
             return await statsService.api.getTopSourcesWithRange(frame.options);
         }
+    },
+    utmGrowth: {
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'utm_type',
+            'order',
+            'limit',
+            'date_from',
+            'date_to',
+            'timezone',
+            'post_id'
+        ],
+        permissions: {
+            docName: 'posts',
+            method: 'browse'
+        },
+        cache: statsService.cache,
+        generateCacheKeyData(frame) {
+            return {
+                method: 'utmGrowth',
+                options: {
+                    utm_type: frame.options.utm_type,
+                    order: frame.options.order,
+                    limit: frame.options.limit,
+                    date_from: frame.options.date_from,
+                    date_to: frame.options.date_to,
+                    timezone: frame.options.timezone,
+                    post_id: frame.options.post_id
+                }
+            };
+        },
+        async query(frame) {
+            return await statsService.api.getUtmGrowthStats(frame.options);
+        }
     }
 
 };

package/core/server/api/endpoints/utils/serializers/input/utils/settings-key-group-mapper.js

@@ -3,6 +3,7 @@ const keyGroupMapping = {
     members_public_key: 'core',
     members_private_key: 'core',
     members_email_auth_secret: 'core',
+    members_otc_secret: 'core',
     db_hash: 'core',
     next_update_check: 'core',
     notifications: 'core',

package/core/server/api/endpoints/utils/serializers/input/utils/settings-key-type-mapper.js

@@ -31,6 +31,7 @@ const keyTypeMapping = {
     members_public_key: 'string',
     members_private_key: 'string',
     members_email_auth_secret: 'string',
+    members_otc_secret: 'string',
     default_content_visibility: 'string',
     stripe_secret_key: 'string',
     stripe_publishable_key: 'string',

package/core/server/data/migrations/versions/6.3/2025-10-02-15-13-31-add-members-otc-secret-setting.js

@@ -0,0 +1,9 @@
+const {addSetting} = require('../../utils');
+const crypto = require('crypto');
+
+module.exports = addSetting({
+    key: 'members_otc_secret',
+    value: crypto.randomBytes(64).toString('hex'),
+    type: 'string',
+    group: 'core'
+});

package/core/server/data/schema/default-settings/default-settings.json

@@ -60,6 +60,10 @@
             "defaultValue": null,
             "type": "string"
         },
+        "members_otc_secret": {
+            "defaultValue": null,
+            "type": "string"
+        },
         "site_uuid": {
             "defaultValue": null,
             "type": "string",

package/core/server/models/settings.js

@@ -57,6 +57,7 @@ function parseDefaultSettings() {
         members_public_key: () => getMembersKey('public'),
         members_private_key: () => getMembersKey('private'),
         members_email_auth_secret: () => crypto.randomBytes(64).toString('hex'),
+        members_otc_secret: () => crypto.randomBytes(64).toString('hex'),
         ghost_public_key: () => getGhostKey('public'),
         ghost_private_key: () => getGhostKey('private'),
         site_uuid: () => getOrGenerateSiteUuid()

package/core/server/services/donations/DonationBookshelfRepository.js

@@ -19,7 +19,12 @@ class DonationBookshelfRepository {
             attribution_type: event.attributionType,
             referrer_source: event.referrerSource,
             referrer_medium: event.referrerMedium,
-            referrer_url: event.referrerUrl
+            referrer_url: event.referrerUrl,
+            utm_source: event.utmSource,
+            utm_medium: event.utmMedium,
+            utm_campaign: event.utmCampaign,
+            utm_term: event.utmTerm,
+            utm_content: event.utmContent
         });
     }
 }

package/core/server/services/donations/DonationBookshelfRepository.ts

@@ -23,6 +23,11 @@ type DonationEventModelInstance = BookshelfModelInstance & {
     referrer_source: string | null;
     referrer_medium: string | null;
     referrer_url: string | null;
+    utm_source: string | null;
+    utm_medium: string | null;
+    utm_campaign: string | null;
+    utm_term: string | null;
+    utm_content: string | null;
 }
 type DonationPaymentEventBookshelfModel = BookshelfModel<DonationEventModelInstance>;
 
@@ -47,7 +52,12 @@ export class DonationBookshelfRepository implements DonationRepository {
             attribution_type: event.attributionType,
             referrer_source: event.referrerSource,
             referrer_medium: event.referrerMedium,
-            referrer_url: event.referrerUrl
+            referrer_url: event.referrerUrl,
+            utm_source: event.utmSource,
+            utm_medium: event.utmMedium,
+            utm_campaign: event.utmCampaign,
+            utm_term: event.utmTerm,
+            utm_content: event.utmContent
         });
     }
 }

package/core/server/services/donations/DonationPaymentEvent.js

@@ -15,6 +15,11 @@ class DonationPaymentEvent {
     referrerSource;
     referrerMedium;
     referrerUrl;
+    utmSource;
+    utmMedium;
+    utmCampaign;
+    utmTerm;
+    utmContent;
     constructor(data, timestamp) {
         this.timestamp = timestamp;
         this.name = data.name;
@@ -29,6 +34,11 @@ class DonationPaymentEvent {
         this.referrerSource = data.referrerSource;
         this.referrerMedium = data.referrerMedium;
         this.referrerUrl = data.referrerUrl;
+        this.utmSource = data.utmSource;
+        this.utmMedium = data.utmMedium;
+        this.utmCampaign = data.utmCampaign;
+        this.utmTerm = data.utmTerm;
+        this.utmContent = data.utmContent;
     }
     static create(data, timestamp) {
         return new DonationPaymentEvent(data, timestamp ?? new Date());

package/core/server/services/donations/DonationPaymentEvent.ts

@@ -13,6 +13,11 @@ export class DonationPaymentEvent {
     referrerSource: string | null;
     referrerMedium: string | null;
     referrerUrl: string | null;
+    utmSource: string | null;
+    utmMedium: string | null;
+    utmCampaign: string | null;
+    utmTerm: string | null;
+    utmContent: string | null;
 
     constructor(data: Omit<DonationPaymentEvent, 'timestamp'>, timestamp: Date) {
         this.timestamp = timestamp;
@@ -30,6 +35,11 @@ export class DonationPaymentEvent {
         this.referrerSource = data.referrerSource;
         this.referrerMedium = data.referrerMedium;
         this.referrerUrl = data.referrerUrl;
+        this.utmSource = data.utmSource;
+        this.utmMedium = data.utmMedium;
+        this.utmCampaign = data.utmCampaign;
+        this.utmTerm = data.utmTerm;
+        this.utmContent = data.utmContent;
     }
 
     static create(data: Omit<DonationPaymentEvent, 'timestamp'>, timestamp?: Date) {

package/core/server/services/member-attribution/AttributionBuilder.js

@@ -7,6 +7,11 @@
  * @prop {string|null} referrerSource
  * @prop {string|null} referrerMedium
  * @prop {string|null} referrerUrl
+ * @prop {string|null} utmSource
+ * @prop {string|null} utmMedium
+ * @prop {string|null} utmCampaign
+ * @prop {string|null} utmTerm
+ * @prop {string|null} utmContent
  */
 
 class Attribution {
@@ -21,9 +26,14 @@ class Attribution {
      * @param {string|null} [data.referrerSource]
      * @param {string|null} [data.referrerMedium]
      * @param {string|null} [data.referrerUrl]
+     * @param {string|null} [data.utmSource]
+     * @param {string|null} [data.utmMedium]
+     * @param {string|null} [data.utmCampaign]
+     * @param {string|null} [data.utmTerm]
+     * @param {string|null} [data.utmContent]
      */
     constructor({
-        id, url, type, referrerSource, referrerMedium, referrerUrl
+        id, url, type, referrerSource, referrerMedium, referrerUrl, utmSource, utmMedium, utmCampaign, utmTerm, utmContent
     }, {urlTranslator}) {
         this.id = id;
         this.url = url;
@@ -31,6 +41,11 @@ class Attribution {
         this.referrerSource = referrerSource;
         this.referrerMedium = referrerMedium;
         this.referrerUrl = referrerUrl;
+        this.utmSource = utmSource;
+        this.utmMedium = utmMedium;
+        this.utmCampaign = utmCampaign;
+        this.utmTerm = utmTerm;
+        this.utmContent = utmContent;
 
         /**
          * @private
@@ -57,7 +72,12 @@ class Attribution {
                     title: null,
                     referrerSource: this.referrerSource,
                     referrerMedium: this.referrerMedium,
-                    referrerUrl: this.referrerUrl
+                    referrerUrl: this.referrerUrl,
+                    utmSource: this.utmSource,
+                    utmMedium: this.utmMedium,
+                    utmCampaign: this.utmCampaign,
+                    utmTerm: this.utmTerm,
+                    utmContent: this.utmContent
                 };
             }
             return {
@@ -67,7 +87,12 @@ class Attribution {
                 title: this.#urlTranslator.getUrlTitle(this.url),
                 referrerSource: this.referrerSource,
                 referrerMedium: this.referrerMedium,
-                referrerUrl: this.referrerUrl
+                referrerUrl: this.referrerUrl,
+                utmSource: this.utmSource,
+                utmMedium: this.utmMedium,
+                utmCampaign: this.utmCampaign,
+                utmTerm: this.utmTerm,
+                utmContent: this.utmContent
             };
         }
 
@@ -80,7 +105,12 @@ class Attribution {
             title: model.get('title') ?? model.get('name') ?? this.#urlTranslator.getUrlTitle(this.url),
             referrerSource: this.referrerSource,
             referrerMedium: this.referrerMedium,
-            referrerUrl: this.referrerUrl
+            referrerUrl: this.referrerUrl,
+            utmSource: this.utmSource,
+            utmMedium: this.utmMedium,
+            utmCampaign: this.utmCampaign,
+            utmTerm: this.utmTerm,
+            utmContent: this.utmContent
         };
     }
 
@@ -118,14 +148,19 @@ class AttributionBuilder {
     /**
      * Creates an Attribution object with the dependencies injected
      */
-    build({id, url, type, referrerSource, referrerMedium, referrerUrl}) {
+    build({id, url, type, referrerSource, referrerMedium, referrerUrl, utmSource, utmMedium, utmCampaign, utmTerm, utmContent}) {
         return new Attribution({
             id,
             url,
             type,
             referrerSource,
             referrerMedium,
-            referrerUrl
+            referrerUrl,
+            utmSource,
+            utmMedium,
+            utmCampaign,
+            utmTerm,
+            utmContent
         }, {urlTranslator: this.urlTranslator});
     }
 
@@ -142,14 +177,24 @@ class AttributionBuilder {
                 type: null,
                 referrerSource: null,
                 referrerMedium: null,
-                referrerUrl: null
+                referrerUrl: null,
+                utmSource: null,
+                utmMedium: null,
+                utmCampaign: null,
+                utmTerm: null,
+                utmContent: null
             });
         }
 
         const referrerData = this.referrerTranslator.getReferrerDetails(history) || {
             referrerSource: null,
             referrerMedium: null,
-            referrerUrl: null
+            referrerUrl: null,
+            utmSource: null,
+            utmMedium: null,
+            utmCampaign: null,
+            utmTerm: null,
+            utmContent: null
         };
 
         // Start at the end. Return the first post we find
@@ -194,10 +239,10 @@ class AttributionBuilder {
 
         // We only have history items without a path that have invalid ids
         return this.build({
-            ...referrerData,
             id: null,
             url: null,
-            type: null
+            type: null,
+            ...referrerData
         });
     }
 }

package/core/server/services/member-attribution/README.md

@@ -0,0 +1,101 @@
+# Member Attribution Service
+
+The Member Attribution Service tracks how members discover and sign up to a Ghost site. It captures attribution data (source pages, referrer information, UTM parameters) and associates it with member signup and subscription events.
+
+## Features
+
+### Core Attribution Tracking
+- **Page Attribution**: Tracks which pages (posts, pages, authors, tags) visitors viewed before becoming members
+- **Referrer Attribution**: Identifies external sources (search engines, social media, direct links) that brought visitors to the site
+- **UTM Parameter Tracking**: Captures UTM campaign parameters (source, medium, campaign, term, content) for marketing attribution
+- **Last Post Algorithm**: Prioritizes the last post viewed in the visitor's journey as the primary attribution source
+
+### Attribution Sources
+- **Content Attribution**: Posts, pages, authors, and tags visited by members
+- **External Referrers**: Tracks referrer sources like Google, Facebook, Twitter, etc. using `@tryghost/referrer-parser`
+- **Manual Creation**: Tracks members created via Admin UI, API, or import tools
+- **Integration Attribution**: Associates members created via integrations with the integration name
+- **Newsletter Links**: Adds attribution tracking to outbound links in newsletters with `?ref=` parameters
+
+### Settings
+- **Member Source Tracking**: Can be enabled/disabled via `members_track_sources` setting
+- **Outbound Link Tagging**: Can be enabled/disabled via `outbound_link_tagging` setting
+
+## Architecture
+
+### Component Overview
+
+```mermaid
+graph TD
+    A[Frontend Browser<br/>member-attribution.js<br/>Captures URL history in session] -->|URLHistory Array| B[MemberAttributionService<br/>Main service interface<br/>Coordinates attribution logic]
+
+    B --> C[AttributionBuilder<br/>Converts URLHistory into Attribution objects<br/>Implements Last Post Algorithm]
+    B --> D[UrlTranslator<br/>Converts paths to resource IDs and types<br/>Fetches Post/Page/Tag/Author models]
+    B --> E[ReferrerTranslator<br/>Parses referrer URLs to identify sources<br/>Extracts UTM parameters]
+    B --> F[OutboundLinkTagger<br/>Adds ?ref parameters to external links]
+
+    C --> D
+    C --> E
+```
+
+### Components
+
+#### 1. **MemberAttributionService** (`MemberAttributionService.js`)
+Main service interface that coordinates all attribution logic.
+
+#### 2. **AttributionBuilder** (`AttributionBuilder.js`)
+Converts URL history into attribution resources using the "Last Post Algorithm™️".
+
+**Key Classes:**
+- `Attribution`: Represents attribution data with methods to fetch and enrich resources
+- `AttributionBuilder`: Factory for creating `Attribution` instances
+
+#### 3. **UrlHistory** (`UrlHistory.js`)
+Validated container for URL history arrays from the frontend.
+
+#### 4. **UrlTranslator** (`UrlTranslator.js`)
+Translates between URLs and Ghost resources.
+
+#### 5. **ReferrerTranslator** (`ReferrerTranslator.js`)
+Parses referrer information into source and medium classifications.
+
+#### 6. **OutboundLinkTagger** (`OutboundLinkTagger.js`)
+Adds `?ref=` parameters to external links in newsletters.
+
+#### 7. **Frontend Script** (`member-attribution.js`)
+Browser-side script that captures visitor journey in sessionStorage.
+
+## Attribution Types
+
+The service supports these attribution types:
+
+| Type     | Description                              | Has ID | Resource Model |
+|----------|------------------------------------------|--------|----------------|
+| `post`   | Blog post                                | ✓      | Post           |
+| `page`   | Static page                              | ✓      | Post           |
+| `author` | Author page                              | ✓      | User           |
+| `tag`    | Tag page                                 | ✓      | Tag            |
+| `url`    | Generic URL (no specific resource)       | ✗      | None           |
+| `null`   | No attribution (tracking disabled/empty) | ✗      | None           |
+
+## Internal Context Sources
+
+When members are created through Ghost's internal systems:
+
+| Context      | referrerSource        | referrerMedium  |
+|--------------|-----------------------|-----------------|
+| `import`     | Imported              | Member Importer |
+| `admin`      | Created manually      | Ghost Admin     |
+| `api`        | Created via API       | Admin API       |
+| `integration`| Integration: {name}   | Admin API       |
+
+## Testing
+
+Tests are located in:
+- `test/unit/server/services/member-attribution/attribution.test.js`
+- `test/unit/server/services/member-attribution/history.test.js`
+- `test/unit/server/services/member-attribution/service.test.js`
+- `test/unit/server/services/member-attribution/url-translator.test.js`
+- `test/unit/server/services/member-attribution/referrer-translator.test.js`
+- `test/unit/server/services/member-attribution/outbound-link-tagger.test.js`
+- `test/e2e-server/services/member-attribution.test.js`

package/core/server/services/member-attribution/ReferrerTranslator.js

@@ -3,6 +3,11 @@
  * @prop {string|null} [referrerSource]
  * @prop {string|null} [referrerMedium]
  * @prop {string|null} [referrerUrl]
+ * @prop {string|null} [utmSource]
+ * @prop {string|null} [utmMedium]
+ * @prop {string|null} [utmCampaign]
+ * @prop {string|null} [utmTerm]
+ * @prop {string|null} [utmContent]
  */
 
 const {ReferrerParser} = require('@tryghost/referrer-parser');
@@ -36,10 +41,40 @@ class ReferrerTranslator {
             return {
                 referrerSource: null,
                 referrerMedium: null,
-                referrerUrl: null
+                referrerUrl: null,
+                utmSource: null,
+                utmMedium: null,
+                utmCampaign: null,
+                utmTerm: null,
+                utmContent: null
             };
         }
 
+        // Look for UTM parameters (earliest entry with UTM data)
+        // Note: history is ordered newest-to-oldest, so we want the LAST match
+        // This captures the original campaign source rather than subsequent navigations
+        let utmData = {
+            utmSource: null,
+            utmMedium: null,
+            utmCampaign: null,
+            utmTerm: null,
+            utmContent: null
+        };
+
+        // In finding the 'campaign' that got the user here, we want the earliest entry with UTM data
+        for (const item of history) {
+            if (item.utmSource || item.utmMedium || item.utmCampaign || item.utmTerm || item.utmContent) {
+                utmData = {
+                    utmSource: item.utmSource || null,
+                    utmMedium: item.utmMedium || null,
+                    utmCampaign: item.utmCampaign || null,
+                    utmTerm: item.utmTerm || null,
+                    utmContent: item.utmContent || null
+                };
+            }
+        }
+
+        // In finding the 'content' that got the user to sign up, we want the latest entry with referrer data
         for (const item of history) {
             let refUrl = this.getUrlFromStr(item.referrerUrl);
             if (refUrl?.hostname === 'checkout.stripe.com') {
@@ -53,7 +88,8 @@ class ReferrerTranslator {
                 return {
                     referrerSource,
                     referrerMedium,
-                    referrerUrl
+                    referrerUrl,
+                    ...utmData
                 };
             }
         }
@@ -61,7 +97,8 @@ class ReferrerTranslator {
         return {
             referrerSource: 'Direct',
             referrerMedium: null,
-            referrerUrl: null
+            referrerUrl: null,
+            ...utmData
         };
     }
 

package/core/server/services/member-attribution/UrlHistory.js

@@ -6,6 +6,11 @@
  * @prop {string} [referrerSource]
  * @prop {string} [referrerMedium]
  * @prop {string} [referrerUrl]
+ * @prop {string} [utmSource]
+ * @prop {string} [utmMedium]
+ * @prop {string} [utmCampaign]
+ * @prop {string} [utmTerm]
+ * @prop {string} [utmContent]
  * @prop {number} time
  */
 

package/core/server/services/members/api.js

@@ -58,7 +58,7 @@ function createApiInstance(config) {
                 validityPeriod: MAGIC_LINK_TOKEN_VALIDITY,
                 validityPeriodAfterUsage: MAGIC_LINK_TOKEN_VALIDITY_AFTER_USAGE,
                 maxUsageCount: MAGIC_LINK_TOKEN_MAX_USAGE_COUNT,
-                secret: settingsCache.get('members_email_auth_secret')
+                secret: settingsCache.get('members_otc_secret')
             })
         },
         mail: {

package/core/server/services/members/members-api/controllers/RouterController.js

@@ -203,6 +203,11 @@ module.exports = class RouterController {
         delete metadata.referrer_source;
         delete metadata.referrer_medium;
         delete metadata.referrer_url;
+        delete metadata.utm_source;
+        delete metadata.utm_medium;
+        delete metadata.utm_campaign;
+        delete metadata.utm_term;
+        delete metadata.utm_content;
 
         if (metadata.urlHistory) {
             // The full attribution history doesn't fit in the Stripe metadata (can't store objects + limited to 50 keys and 500 chars values)
@@ -236,6 +241,27 @@ module.exports = class RouterController {
             if (attribution.referrerUrl) {
                 metadata.referrer_url = attribution.referrerUrl;
             }
+
+            // UTM parameters
+            if (attribution.utmSource) {
+                metadata.utm_source = attribution.utmSource;
+            }
+
+            if (attribution.utmMedium) {
+                metadata.utm_medium = attribution.utmMedium;
+            }
+
+            if (attribution.utmCampaign) {
+                metadata.utm_campaign = attribution.utmCampaign;
+            }
+
+            if (attribution.utmTerm) {
+                metadata.utm_term = attribution.utmTerm;
+            }
+
+            if (attribution.utmContent) {
+                metadata.utm_content = attribution.utmContent;
+            }
         }
     }
 

package/core/server/services/members/members-api/repositories/MemberRepository.js

@@ -1179,7 +1179,12 @@ module.exports = class MemberRepository {
                 type: data.attribution?.type ?? stripeSubscriptionData.metadata?.attribution_type ?? null,
                 referrerSource: data.attribution?.referrerSource ?? stripeSubscriptionData.metadata?.referrer_source ?? null,
                 referrerMedium: data.attribution?.referrerMedium ?? stripeSubscriptionData.metadata?.referrer_medium ?? null,
-                referrerUrl: data.attribution?.referrerUrl ?? stripeSubscriptionData.metadata?.referrer_url ?? null
+                referrerUrl: data.attribution?.referrerUrl ?? stripeSubscriptionData.metadata?.referrer_url ?? null,
+                utmSource: data.attribution?.utmSource ?? stripeSubscriptionData.metadata?.utm_source ?? null,
+                utmMedium: data.attribution?.utmMedium ?? stripeSubscriptionData.metadata?.utm_medium ?? null,
+                utmCampaign: data.attribution?.utmCampaign ?? stripeSubscriptionData.metadata?.utm_campaign ?? null,
+                utmTerm: data.attribution?.utmTerm ?? stripeSubscriptionData.metadata?.utm_term ?? null,
+                utmContent: data.attribution?.utmContent ?? stripeSubscriptionData.metadata?.utm_content ?? null
             };
 
             const subscriptionCreatedEvent = SubscriptionCreatedEvent.create({

package/core/server/services/members-events/EventStorage.js

@@ -35,6 +35,11 @@ class EventStorage {
                 referrer_source: attribution?.referrerSource ?? null,
                 referrer_medium: attribution?.referrerMedium ?? null,
                 referrer_url: attribution?.referrerUrl ?? null,
+                utm_source: attribution?.utmSource ?? null,
+                utm_medium: attribution?.utmMedium ?? null,
+                utm_campaign: attribution?.utmCampaign ?? null,
+                utm_term: attribution?.utmTerm ?? null,
+                utm_content: attribution?.utmContent ?? null,
                 batch_id: event.data.batchId ?? null
             });
         });
@@ -52,6 +57,11 @@ class EventStorage {
                 referrer_source: attribution?.referrerSource ?? null,
                 referrer_medium: attribution?.referrerMedium ?? null,
                 referrer_url: attribution?.referrerUrl ?? null,
+                utm_source: attribution?.utmSource ?? null,
+                utm_medium: attribution?.utmMedium ?? null,
+                utm_campaign: attribution?.utmCampaign ?? null,
+                utm_term: attribution?.utmTerm ?? null,
+                utm_content: attribution?.utmContent ?? null,
                 batch_id: event.data.batchId ?? null
             });
         });