Added @tryghost/metrics-server as a dependency

.github/workflows/ci.yml

@@ -445,6 +445,11 @@ jobs:
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_setup.outputs.dependency_cache_key }}
 
+      - name: Set timezone (non-UTC)
+        uses: szenius/[email protected]
+        with:
+          timezoneLinux: "America/New_York"
+
       - run: yarn nx affected -t test:unit --base=${{ needs.job_setup.outputs.BASE_COMMIT }}
 
       - uses: actions/upload-artifact@v4
@@ -504,6 +509,11 @@ jobs:
         env:
           DEPENDENCY_CACHE_KEY: ${{ needs.job_setup.outputs.dependency_cache_key }}
 
+      - name: Set timezone (non-UTC)
+        uses: szenius/[email protected]
+        with:
+          timezoneLinux: "America/New_York"
+
       - name: Record start time
         run: date +%s > ${{ runner.temp }}/startTime # Get start time for test suite
 

ghost/admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost-admin",
-  "version": "5.96.1",
+  "version": "5.96.2",
   "description": "Ember.js admin client for Ghost",
   "author": "Ghost Foundation",
   "homepage": "http://ghost.org",

ghost/core/core/frontend/services/sitemap/BaseSiteMapGenerator.js

@@ -1,5 +1,6 @@
 const _ = require('lodash');
 const xml = require('xml');
+const moment = require('moment');
 const path = require('path');
 const urlUtils = require('../../../shared/url-utils');
 const localUtils = require('./utils');
@@ -95,24 +96,23 @@ class BaseSiteMapGenerator {
     }
 
     /**
-     * @returns {Date}
+     * @returns {moment.Moment}
      */
     getLastModifiedForDatum(datum) {
         if (datum.updated_at || datum.published_at || datum.created_at) {
             const modifiedDate = datum.updated_at || datum.published_at || datum.created_at;
 
-            return new Date(modifiedDate);
+            return moment(modifiedDate);
         } else {
-            return new Date();
+            return moment();
         }
     }
 
     updateLastModified(datum) {
         const lastModified = this.getLastModifiedForDatum(datum);
-        const lastModifiedTime = lastModified.getTime();
 
-        if (lastModifiedTime > this.lastModified) {
-            this.lastModified = lastModifiedTime;
+        if (lastModified > this.lastModified) {
+            this.lastModified = lastModified;
         }
     }
 

ghost/core/core/server/api/endpoints/utils/serializers/output/members.js

@@ -167,7 +167,8 @@ function serializeMember(member, options) {
         email_recipients: json.email_recipients,
         status: json.status,
         last_seen_at: json.last_seen_at,
-        attribution: serializeAttribution(json.attribution)
+        attribution: serializeAttribution(json.attribution),
+        unsubscribe_url: json.unsubscribe_url
     };
 
     if (json.products) {

ghost/core/core/server/data/migrations/versions/5.97/2024-10-10-01-02-03-add-signin-urls-permissions.js

@@ -0,0 +1,6 @@
+const {addPermissionToRole} = require('../../utils');
+
+module.exports = addPermissionToRole({
+    permission: 'Read member signin urls',
+    role: 'Admin Integration'
+});

ghost/core/core/server/data/schema/fixtures/fixtures.json

@@ -907,7 +907,8 @@
                     "link": "all",
                     "mention": "browse",
                     "collection": "all",
-                    "recommendation": "all"
+                    "recommendation": "all",
+                    "member_signin_url": "read"
                 },
                 "Editor": {
                     "notification": "all",

ghost/core/core/server/models/base/plugins/data-manipulation.js

@@ -54,19 +54,14 @@ module.exports = function (Bookshelf) {
 
             Object.keys(attrs).forEach((key) => {
                 if (attrs[key] && tableDef?.[key]?.type === 'dateTime') {
-                    const dateValue = new Date(attrs[key]);
+                    const dateMoment = moment(attrs[key]);
 
                     // CASE: You are somehow able to store e.g. 0000-00-00 00:00:00
                     // Protect the code base and return the current date time.
-                    if (!isNaN(dateValue.getTime())) {
-                        // Valid date: set to the start of the second
-                        dateValue.setMilliseconds(0);
-                        attrs[key] = dateValue;
+                    if (dateMoment.isValid()) {
+                        attrs[key] = dateMoment.startOf('seconds').toDate();
                     } else {
-                        // Invalid date: use current date-time
-                        const currentDate = new Date();
-                        currentDate.setMilliseconds(0);
-                        attrs[key] = currentDate;
+                        attrs[key] = moment().startOf('seconds').toDate();
                     }
                 }
             });

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

@@ -1,5 +1,6 @@
 const stripeService = require('../stripe');
 const settingsCache = require('../../../shared/settings-cache');
+const settingsHelpers = require('../../services/settings-helpers');
 const MembersApi = require('@tryghost/members-api');
 const logging = require('@tryghost/logging');
 const mail = require('../mail');
@@ -236,7 +237,8 @@ function createApiInstance(config) {
         memberAttributionService: memberAttributionService.service,
         emailSuppressionList,
         settingsCache,
-        sentry
+        sentry,
+        settingsHelpers
     });
 
     return membersApiInstance;

ghost/core/core/server/services/members/utils.js

@@ -22,6 +22,7 @@ module.exports.formattedMemberResponse = function formattedMemberResponse(member
         firstname: member.name && member.name.split(' ')[0],
         expertise: member.expertise,
         avatar_image: member.avatar_image,
+        unsubscribe_url: member.unsubscribe_url,
         subscribed: !!member.subscribed,
         subscriptions: member.subscriptions || [],
         paid: member.status !== 'free',

ghost/core/core/server/services/settings-helpers/SettingsHelpers.js

@@ -2,6 +2,7 @@ const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const {EmailAddressParser} = require('@tryghost/email-addresses');
 const logging = require('@tryghost/logging');
+const crypto = require('crypto');
 
 const messages = {
     incorrectKeyType: 'type must be one of "direct" or "connect".'
@@ -179,6 +180,30 @@ class SettingsHelpers {
         return this.#managedEmailEnabled() || this.labs.isSet('newEmailAddresses');
     }
 
+    createUnsubscribeUrl(uuid, options = {}) {
+        const siteUrl = this.urlUtils.urlFor('home', true);
+        const unsubscribeUrl = new URL(siteUrl);
+        const key = this.getMembersValidationKey();
+        unsubscribeUrl.pathname = `${unsubscribeUrl.pathname}/unsubscribe/`.replace('//', '/');
+        if (uuid) {
+            // hash key with member uuid for verification (and to not leak uuid) - it's possible to update member email prefs without logging in
+            // @ts-ignore
+            const hmac = crypto.createHmac('sha256', key).update(`${uuid}`).digest('hex');
+            unsubscribeUrl.searchParams.set('uuid', uuid);
+            unsubscribeUrl.searchParams.set('key', hmac);
+        } else {
+            unsubscribeUrl.searchParams.set('preview', '1');
+        }
+        if (options.newsletterUuid) {
+            unsubscribeUrl.searchParams.set('newsletter', options.newsletterUuid);
+        }
+        if (options.comments) {
+            unsubscribeUrl.searchParams.set('comments', '1');
+        }
+
+        return unsubscribeUrl.href;
+    }
+
     // PRIVATE
 
     #managedEmailEnabled() {

ghost/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.96.1",
+  "version": "5.96.2",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -126,6 +126,7 @@
     "@tryghost/members-stripe-service": "0.0.0",
     "@tryghost/mentions-email-report": "0.0.0",
     "@tryghost/metrics": "1.0.34",
+    "@tryghost/metrics-server": "0.0.0",
     "@tryghost/milestones": "0.0.0",
     "@tryghost/minifier": "0.0.0",
     "@tryghost/model-to-domain-event-interceptor": "0.0.0",