ghost 6.0.10 → 6.2.0

package/core/server/data/tinybird/tests/api_top_utm_mediums.yaml

@@ -1,108 +1,110 @@
 
 - name: Date range
-  description: All fixture data
+  description: All fixture data - real UTM mediums from mv_session_data
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
   expected_result: |
-    {"utm_medium":"email","visits":6}
-    {"utm_medium":"cpc","visits":3}
-    {"utm_medium":"organic","visits":3}
-    {"utm_medium":"referral","visits":3}
+    {"utm_medium":"social","visits":5}
+    {"utm_medium":"cpc","visits":2}
+    {"utm_medium":"organic","visits":1}
+    {"utm_medium":"referral","visits":1}
     {"utm_medium":"display","visits":1}
+    {"utm_medium":"email","visits":1}
 
 - name: Filtered by browser - Chrome
   description: Filtered by browser - Chrome
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
   expected_result: |
-    {"utm_medium":"email","visits":4}
-    {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"social","visits":2}
     {"utm_medium":"organic","visits":1}
     {"utm_medium":"referral","visits":1}
+    {"utm_medium":"display","visits":1}
 
 - name: Filtered by device - desktop
   description: Filtered by device - desktop
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
   expected_result: |
-    {"utm_medium":"email","visits":6}
-    {"utm_medium":"cpc","visits":3}
-    {"utm_medium":"referral","visits":3}
-    {"utm_medium":"organic","visits":2}
+    {"utm_medium":"social","visits":5}
+    {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"organic","visits":1}
+    {"utm_medium":"referral","visits":1}
     {"utm_medium":"display","visits":1}
+    {"utm_medium":"email","visits":1}
 
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
   expected_result: |
-    {"utm_medium":"email","visits":3}
-    {"utm_medium":"organic","visits":2}
-    {"utm_medium":"referral","visits":2}
     {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"organic","visits":1}
+    {"utm_medium":"referral","visits":1}
+    {"utm_medium":"social","visits":1}
+    {"utm_medium":"display","visits":1}
+    {"utm_medium":"email","visits":1}
 
 - name: Filtered by OS - Windows
   description: Filtered by OS - Windows
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
   expected_result: |
-    {"utm_medium":"email","visits":5}
-    {"utm_medium":"cpc","visits":3}
-    {"utm_medium":"referral","visits":3}
-    {"utm_medium":"organic","visits":2}
+    {"utm_medium":"social","visits":5}
+    {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"organic","visits":1}
+    {"utm_medium":"referral","visits":1}
     {"utm_medium":"display","visits":1}
+    {"utm_medium":"email","visits":1}
 
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_medium":"email","visits":4}
-    {"utm_medium":"cpc","visits":2}
-    {"utm_medium":"organic","visits":1}
+    {"utm_medium":"social","visits":3}
     {"utm_medium":"referral","visits":1}
+    {"utm_medium":"display","visits":1}
+    {"utm_medium":"email","visits":1}
 
 - name: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   description: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=06b1b0c9-fb53-4a15-a060-3db3fde7b1fc
   expected_result: |
-    {"utm_medium":"email","visits":4}
-    {"utm_medium":"cpc","visits":2}
-    {"utm_medium":"organic","visits":1}
+    {"utm_medium":"social","visits":3}
     {"utm_medium":"referral","visits":1}
+    {"utm_medium":"display","visits":1}
+    {"utm_medium":"email","visits":1}
 
 - name: Filtered by source - bing.com
   description: Filtered by source - bing.com
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
   expected_result: |
-    {"utm_medium":"cpc","visits":2}
+    {"utm_medium":"social","visits":1}
+    {"utm_medium":"email","visits":1}
 
 - name: Filtered by member status - paid
   description: Filtered by member status - paid
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=paid
   expected_result: |
-    {"utm_medium":"referral","visits":2}
-    {"utm_medium":"email","visits":2}
-    {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"social","visits":2}
+    {"utm_medium":"organic","visits":1}
 
 - name: Filtered by member status - undefined
   description: Filtered by member status - undefined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=undefined
   expected_result: |
-    {"utm_medium":"organic","visits":3}
+    {"utm_medium":"cpc","visits":2}
     {"utm_medium":"referral","visits":1}
-    {"utm_medium":"display","visits":1}
-    {"utm_medium":"email","visits":1}
+    {"utm_medium":"social","visits":1}
 
 - name: Filtered by timezone - America/Los_Angeles
   description: Filtered by timezone - America/Los_Angeles
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=America/Los_Angeles
   expected_result: |
-    {"utm_medium":"email","visits":5}
-    {"utm_medium":"referral","visits":3}
-    {"utm_medium":"cpc","visits":2}
-    {"utm_medium":"organic","visits":2}
+    {"utm_medium":"social","visits":4}
+    {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"organic","visits":1}
+    {"utm_medium":"referral","visits":1}
     {"utm_medium":"display","visits":1}
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
   expected_result: |
-    {"utm_medium":"referral","visits":2}
+    {"utm_medium":"social","visits":3}
     {"utm_medium":"cpc","visits":1}
-    {"utm_medium":"organic","visits":1}
-    {"utm_medium":"display","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_sources.yaml

@@ -1,108 +1,128 @@
 
 - name: Date range
-  description: All fixture data
+  description: All fixture data - real UTM sources from mv_session_data
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
   expected_result: |
-    {"utm_source":"google","visits":6}
-    {"utm_source":"linkedin","visits":3}
-    {"utm_source":"twitter","visits":3}
-    {"utm_source":"newsletter","visits":3}
+    {"utm_source":"google","visits":3}
+    {"utm_source":"linkedin","visits":1}
+    {"utm_source":"twitter","visits":1}
+    {"utm_source":"facebook","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"reddit","visits":1}
     {"utm_source":"instagram","visits":1}
+    {"utm_source":"partner_site","visits":1}
+    {"utm_source":"newsletter","visits":1}
 
 - name: Filtered by browser - Chrome
   description: Filtered by browser - Chrome
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
   expected_result: |
-    {"utm_source":"google","visits":4}
-    {"utm_source":"linkedin","visits":1}
-    {"utm_source":"twitter","visits":1}
-    {"utm_source":"newsletter","visits":1}
+    {"utm_source":"google","visits":1}
+    {"utm_source":"facebook","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"instagram","visits":1}
+    {"utm_source":"partner_site","visits":1}
 
 - name: Filtered by device - desktop
   description: Filtered by device - desktop
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
   expected_result: |
-    {"utm_source":"google","visits":6}
-    {"utm_source":"twitter","visits":3}
-    {"utm_source":"newsletter","visits":3}
-    {"utm_source":"linkedin","visits":2}
+    {"utm_source":"google","visits":2}
+    {"utm_source":"linkedin","visits":1}
+    {"utm_source":"twitter","visits":1}
+    {"utm_source":"facebook","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"reddit","visits":1}
     {"utm_source":"instagram","visits":1}
+    {"utm_source":"partner_site","visits":1}
+    {"utm_source":"newsletter","visits":1}
 
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
   expected_result: |
-    {"utm_source":"google","visits":3}
-    {"utm_source":"linkedin","visits":2}
-    {"utm_source":"newsletter","visits":2}
+    {"utm_source":"google","visits":2}
     {"utm_source":"twitter","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"partner_site","visits":1}
+    {"utm_source":"newsletter","visits":1}
 
 - name: Filtered by OS - Windows
   description: Filtered by OS - Windows
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
   expected_result: |
-    {"utm_source":"google","visits":5}
-    {"utm_source":"twitter","visits":3}
-    {"utm_source":"newsletter","visits":3}
-    {"utm_source":"linkedin","visits":2}
+    {"utm_source":"google","visits":2}
+    {"utm_source":"linkedin","visits":1}
+    {"utm_source":"twitter","visits":1}
+    {"utm_source":"facebook","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"reddit","visits":1}
     {"utm_source":"instagram","visits":1}
+    {"utm_source":"partner_site","visits":1}
+    {"utm_source":"newsletter","visits":1}
 
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_source":"google","visits":4}
-    {"utm_source":"twitter","visits":2}
-    {"utm_source":"linkedin","visits":1}
+    {"utm_source":"twitter","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"reddit","visits":1}
+    {"utm_source":"instagram","visits":1}
+    {"utm_source":"partner_site","visits":1}
     {"utm_source":"newsletter","visits":1}
 
 - name: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   description: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=06b1b0c9-fb53-4a15-a060-3db3fde7b1fc
   expected_result: |
-    {"utm_source":"google","visits":4}
-    {"utm_source":"twitter","visits":2}
-    {"utm_source":"linkedin","visits":1}
+    {"utm_source":"twitter","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"reddit","visits":1}
+    {"utm_source":"instagram","visits":1}
+    {"utm_source":"partner_site","visits":1}
     {"utm_source":"newsletter","visits":1}
 
 - name: Filtered by source - bing.com
   description: Filtered by source - bing.com
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
   expected_result: |
-    {"utm_source":"twitter","visits":2}
+    {"utm_source":"instagram","visits":1}
+    {"utm_source":"newsletter","visits":1}
 
 - name: Filtered by member status - paid
   description: Filtered by member status - paid
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=paid
   expected_result: |
-    {"utm_source":"google","visits":2}
-    {"utm_source":"newsletter","visits":2}
     {"utm_source":"twitter","visits":1}
+    {"utm_source":"google","visits":1}
+    {"utm_source":"instagram","visits":1}
 
 - name: Filtered by member status - undefined
   description: Filtered by member status - undefined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=undefined
   expected_result: |
-    {"utm_source":"linkedin","visits":3}
-    {"utm_source":"google","visits":1}
-    {"utm_source":"instagram","visits":1}
-    {"utm_source":"newsletter","visits":1}
+    {"utm_source":"google","visits":2}
+    {"utm_source":"reddit","visits":1}
+    {"utm_source":"partner_site","visits":1}
 
 - name: Filtered by timezone - America/Los_Angeles
   description: Filtered by timezone - America/Los_Angeles
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=America/Los_Angeles
   expected_result: |
-    {"utm_source":"google","visits":5}
-    {"utm_source":"newsletter","visits":3}
-    {"utm_source":"linkedin","visits":2}
-    {"utm_source":"twitter","visits":2}
+    {"utm_source":"google","visits":2}
+    {"utm_source":"linkedin","visits":1}
+    {"utm_source":"twitter","visits":1}
+    {"utm_source":"bing","visits":1}
+    {"utm_source":"reddit","visits":1}
     {"utm_source":"instagram","visits":1}
+    {"utm_source":"partner_site","visits":1}
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
   expected_result: |
-    {"utm_source":"newsletter","visits":2}
     {"utm_source":"linkedin","visits":1}
     {"utm_source":"twitter","visits":1}
-    {"utm_source":"instagram","visits":1}
+    {"utm_source":"google","visits":1}
+    {"utm_source":"reddit","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_terms.yaml

@@ -3,106 +3,113 @@
   description: All fixture data
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
   expected_result: |
-    {"utm_term":"ghost cms","visits":6}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":3}
-    {"utm_term":"newsletter platform","visits":3}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by browser - Chrome
   description: Filtered by browser - Chrome
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
   expected_result: |
-    {"utm_term":"ghost cms","visits":4}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"content management","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
 
 - name: Filtered by device - desktop
   description: Filtered by device - desktop
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
   expected_result: |
-    {"utm_term":"ghost cms","visits":6}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":3}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
   expected_result: |
-    {"utm_term":"ghost cms","visits":3}
-    {"utm_term":"blog software","visits":2}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"content management","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"new_feature","visits":1}
 
 - name: Filtered by OS - Windows
   description: Filtered by OS - Windows
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
   expected_result: |
-    {"utm_term":"ghost cms","visits":5}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":3}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_term":"ghost cms","visits":4}
-    {"utm_term":"content management","visits":2}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   description: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=06b1b0c9-fb53-4a15-a060-3db3fde7b1fc
   expected_result: |
-    {"utm_term":"ghost cms","visits":4}
-    {"utm_term":"content management","visits":2}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by source - bing.com
   description: Filtered by source - bing.com
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
   expected_result: |
-    {"utm_term":"content management","visits":2}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
 
 - name: Filtered by member status - paid
   description: Filtered by member status - paid
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=paid
   expected_result: |
-    {"utm_term":"blog software","visits":2}
-    {"utm_term":"ghost cms","visits":2}
-    {"utm_term":"content management","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"new_feature","visits":1}
 
 - name: Filtered by member status - undefined
   description: Filtered by member status - undefined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=undefined
   expected_result: |
-    {"utm_term":"newsletter platform","visits":3}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"membership site","visits":1}
-    {"utm_term":"ghost cms","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by timezone - America/Los_Angeles
   description: Filtered by timezone - America/Los_Angeles
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=America/Los_Angeles
   expected_result: |
-    {"utm_term":"ghost cms","visits":5}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":2}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
   expected_result: |
-    {"utm_term":"blog software","visits":2}
-    {"utm_term":"membership site","visits":1}
-    {"utm_term":"content management","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}

package/core/server/models/single-use-token.js

@@ -7,6 +7,7 @@ const SingleUseToken = ghostBookshelf.Model.extend({
     defaults() {
         return {
             used_count: 0,
+            uuid: crypto.randomUUID(),
             token: crypto
                 .randomBytes(192 / 8)
                 .toString('base64')

package/core/server/services/email-service/EmailRenderer.js

@@ -1241,6 +1241,7 @@ class EmailRenderer {
                     }, true) : null
             },
             preheader: this.#getEmailPreheader(post, segment, html),
+            preheaderSpacing: `${' ͏ '.repeat(150)}${'­ '.repeat(200)}  `,
             html,
 
             post: {

package/core/server/services/email-service/email-templates/template.hbs

@@ -9,6 +9,12 @@
     </head>
     <body>
         <span class="preheader">{{preheader}}</span>
+        {{#hasFeature 'emailCustomization'}}
+        <!-- SPACING TO AVOID BODY TEXT BEING DUPLICATED IN PREVIEW TEXT -->
+        <div style="display:none; max-height:0; overflow:hidden; mso-hide: all;" aria-hidden="true" role="presentation">
+            {{{preheaderSpacing}}}
+        </div>
+        {{/hasFeature}}
 
         <!-- HEADER WITH FULL-WIDTH BACKGROUND -->
         {{#if hasHeaderContent}}

package/core/server/services/lib/MailgunClient.js

@@ -67,7 +67,8 @@ module.exports = class MailgunClient {
                 subject: messageContent.subject,
                 html: messageContent.html,
                 text: messageContent.plaintext,
-                'recipient-variables': JSON.stringify(recipientData)
+                'recipient-variables': JSON.stringify(recipientData),
+                'h:Sender': message.from
             };
 
             // Do we have a custom List-Unsubscribe header set?
@@ -348,9 +349,9 @@ module.exports = class MailgunClient {
     /**
      * Returns the configured target delivery window in seconds
      * Ghost will attempt to deliver emails evenly distributed over this window
-     * 
+     *
      * Defaults to 0 (no delay) if not set
-     * 
+     *
      * @returns {number}
      */
     getTargetDeliveryWindow() {

package/core/server/services/lib/magic-link/MagicLink.js

@@ -23,7 +23,7 @@ const messages = {
  * @typedef {Object} TokenProvider<T, D>
  * @prop {(data: D) => Promise<T>} create
  * @prop {(token: T, options?: TokenValidateOptions) => Promise<D>} validate
- * @prop {(token: T) => Promise<string | null>} [getIdByToken]
+ * @prop {(token: T) => Promise<string | null>} [getRefByToken]
  * @prop {(otcRef: string, tokenValue: T) => string} [deriveOTC]
  */
 
@@ -108,7 +108,7 @@ class MagicLink {
         let otcRef = null;
         if (this.labsService?.isSet('membersSigninOTC') && otc) {
             try {
-                otcRef = await this.getIdFromToken(token);
+                otcRef = await this.getRefFromToken(token);
             } catch (err) {
                 this.sentry?.captureException?.(err);
                 otcRef = null;
@@ -135,17 +135,17 @@ class MagicLink {
     }
 
     /**
-     * getIdFromToken
+     * getRefFromToken
      *
-     * @param {Token} token - The token to get the id from
-     * @returns {Promise<string|null>} id - The id of the token
+     * @param {Token} token - The token to get the ref from
+     * @returns {Promise<string|null>} ref - The ref of the token
      */
-    async getIdFromToken(token) {
-        if (typeof this.tokenProvider.getIdByToken !== 'function') {
+    async getRefFromToken(token) {
+        if (typeof this.tokenProvider.getRefByToken !== 'function') {
             return null;
         }
 
-        const id = await this.tokenProvider.getIdByToken(token);
+        const id = await this.tokenProvider.getRefByToken(token);
         return id;
     }
 
@@ -156,7 +156,7 @@ class MagicLink {
      * @returns {Promise<string|null>} otc - The otc of the token
      */
     async getOTCFromToken(token) {
-        const tokenId = await this.getIdFromToken(token);
+        const tokenId = await this.getRefFromToken(token);
 
         if (!tokenId || typeof this.tokenProvider.deriveOTC !== 'function') {
             return null;

package/core/server/services/mail/GhostMailer.js

@@ -68,7 +68,10 @@ function createMessage(message) {
         ...message,
         ...addresses,
         generateTextFromHTML,
-        encoding
+        encoding,
+        headers: {
+            Sender: addresses.from
+        }
     };
 }
 

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

@@ -1,6 +1,5 @@
 const logging = require('@tryghost/logging');
 const {URL} = require('url');
-const crypto = require('crypto');
 const createKeypair = require('keypair');
 
 class MembersConfigProvider {
@@ -42,20 +41,6 @@ class MembersConfigProvider {
         return this._settingsHelpers.isStripeConnected();
     }
 
-    getAuthSecret() {
-        const hexSecret = this._settingsCache.get('members_email_auth_secret');
-        if (!hexSecret) {
-            logging.warn('Could not find members_email_auth_secret, using dynamically generated secret');
-            return crypto.randomBytes(64);
-        }
-        const secret = Buffer.from(hexSecret, 'hex');
-        if (secret.length < 64) {
-            logging.warn('members_email_auth_secret not large enough (64 bytes), using dynamically generated secret');
-            return crypto.randomBytes(64);
-        }
-        return secret;
-    }
-
     getAllowSelfSignup() {
         // Free signups are allowed only if the site subscription is set to "Full-access"
         // It is blocked for "Invite-only", "Paid-members-only" and "None" accesses