ghost 5.24.2 → 5.25.0

package/core/server/services/email-analytics/lib/event-processor.js

@@ -1,178 +0,0 @@
-const {EventProcessor} = require('@tryghost/email-analytics-service');
-const {default: ObjectID} = require('bson-objectid');
-const moment = require('moment-timezone');
-
-class GhostEventProcessor extends EventProcessor {
-    constructor({db}) {
-        super(...arguments);
-
-        this.db = db;
-
-        // avoid having to query email_batch by provider_id for every event
-        this.providerIdEmailIdMap = {};
-    }
-
-    async getEmailId(event) {
-        if (event.emailId) {
-            return event.emailId;
-        }
-
-        if (event.providerId) {
-            if (this.providerIdEmailIdMap[event.providerId]) {
-                return this.providerIdEmailIdMap[event.providerId];
-            }
-
-            const {emailId} = await this.db.knex('email_batches')
-                .select('email_id as emailId')
-                .where('provider_id', event.providerId)
-                .first() || {};
-
-            if (!emailId) {
-                return;
-            }
-
-            this.providerIdEmailIdMap[event.providerId] = emailId;
-            return emailId;
-        }
-
-        return undefined;
-    }
-
-    async getMemberId(event) {
-        const emailId = await this.getEmailId(event);
-
-        if (!emailId) {
-            return false;
-        }
-
-        if (emailId && event.recipientEmail) {
-            const {memberId} = await this.db.knex('email_recipients')
-                .select('member_id as memberId')
-                .where('member_email', event.recipientEmail)
-                .where('email_id', emailId)
-                .first() || {};
-
-            return memberId;
-        }
-
-        return undefined;
-    }
-
-    async handleDelivered(event) {
-        const emailId = await this.getEmailId(event);
-
-        if (!emailId) {
-            return false;
-        }
-
-        const updateResult = await this.db.knex('email_recipients')
-            .where('email_id', '=', emailId)
-            .where('member_email', '=', event.recipientEmail)
-            .update({
-                delivered_at: this.db.knex.raw('COALESCE(delivered_at, ?)', [moment.utc(event.timestamp).format('YYYY-MM-DD HH:mm:ss')])
-            });
-
-        return updateResult > 0;
-    }
-
-    async handleOpened(event) {
-        const emailId = await this.getEmailId(event);
-
-        if (!emailId) {
-            return false;
-        }
-
-        const updateResult = await this.db.knex('email_recipients')
-            .where('email_id', '=', emailId)
-            .where('member_email', '=', event.recipientEmail)
-            .update({
-                opened_at: this.db.knex.raw('COALESCE(opened_at, ?)', [moment.utc(event.timestamp).format('YYYY-MM-DD HH:mm:ss')])
-            });
-
-        // Using the default timezone set in https://github.com/TryGhost/Ghost/blob/2c5643623db0fc4db390f6997c81a73dca7ccacd/core/server/data/schema/default-settings/default-settings.json#L105
-        let timezone = 'Etc/UTC';
-        const timezoneData = await this.db.knex('settings').first('value').where('key', 'timezone');
-        if (timezoneData && timezoneData.value) {
-            timezone = timezoneData.value;
-        }
-
-        await this.db.knex('members')
-            .where('email', '=', event.recipientEmail)
-            .andWhere(builder => builder
-                .where('last_seen_at', '<', moment.utc(event.timestamp).tz(timezone).startOf('day').utc().format('YYYY-MM-DD HH:mm:ss'))
-                .orWhereNull('last_seen_at')
-            )
-            .update({
-                last_seen_at: moment.utc(event.timestamp).format('YYYY-MM-DD HH:mm:ss')
-            });
-
-        return updateResult > 0;
-    }
-
-    async handleTemporaryFailed(/*event*/) {
-        // noop - we don't do anything with temporary failures for now
-    }
-
-    async handlePermanentFailed(event) {
-        const emailId = await this.getEmailId(event);
-
-        if (!emailId) {
-            return false;
-        }
-
-        const updateResult = await this.db.knex('email_recipients')
-            .where('email_id', '=', emailId)
-            .where('member_email', '=', event.recipientEmail)
-            .update({
-                failed_at: this.db.knex.raw('COALESCE(failed_at, ?)', [moment.utc(event.timestamp).format('YYYY-MM-DD HH:mm:ss')])
-            });
-
-        return updateResult > 0;
-    }
-
-    async handleUnsubscribed(event) {
-        return this._unsubscribeFromNewsletters(event);
-    }
-
-    async handleComplained(event) {
-        return this._unsubscribeFromNewsletters(event);
-    }
-
-    async _unsubscribeFromNewsletters(event) {
-        const memberId = await this.getMemberId(event);
-
-        if (!memberId) {
-            return false;
-        }
-
-        const subscribedNewsletterIds = await this.db.knex('members_newsletters')
-            .where('member_id', '=', memberId)
-            .pluck('newsletter_id');
-
-        await this.db.knex('members_newsletters')
-            .where('member_id', '=', memberId)
-            .del();
-
-        const nowUTC = moment.utc().toDate();
-        for (const newsletterId of subscribedNewsletterIds) {
-            await this.db.knex('members_subscribe_events').insert({
-                id: ObjectID().toHexString(),
-                member_id: memberId,
-                newsletter_id: newsletterId,
-                subscribed: false,
-                created_at: nowUTC,
-                source: 'member'
-            });
-        }
-
-        const updateResult = await this.db.knex('members')
-            .where('id', '=', memberId)
-            .update({
-                updated_at: moment.utc().toDate()
-            });
-
-        return updateResult > 0;
-    }
-}
-
-module.exports = GhostEventProcessor;

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

@@ -1,30 +0,0 @@
-const urlUtils = require('../../../shared/url-utils');
-const SingleUseTokenProvider = require('./SingleUseTokenProvider');
-const models = require('../../models');
-const MAGIC_LINK_TOKEN_VALIDITY = 24 * 60 * 60 * 1000;
-
-// @todo: can get removed, since this is moved to the settings bread service
-function createSettingsInstance() {
-    const oldTokenProvider = new SingleUseTokenProvider(models.SingleUseToken, MAGIC_LINK_TOKEN_VALIDITY);
-
-    const getEmailFromToken = async ({token}) => {
-        const data = await oldTokenProvider.validate(token);
-        return data.email;
-    };
-
-    const getAdminRedirectLink = ({type}) => {
-        const adminUrl = urlUtils.urlFor('admin', true);
-        if (type === 'supportAddressUpdate') {
-            return urlUtils.urlJoin(adminUrl, `#/settings/members/?${type}=success`);
-        } else {
-            return urlUtils.urlJoin(adminUrl, `#/site/`);
-        }
-    };
-
-    return {
-        getEmailFromToken,
-        getAdminRedirectLink
-    };
-}
-
-module.exports = createSettingsInstance;

package/playwright.config.js

@@ -1,26 +0,0 @@
-/** @type {import('@playwright/test').PlaywrightTestConfig} */
-
-const config = {
-    timeout: 60 * 1000,
-    workers: 1,
-    use: {
-        // Use a single browser since we can't simultaneously test multiple browsers
-        browserName: 'chromium',
-        baseURL: process.env.TEST_URL ?? 'http://localhost:2368',
-        headless: false
-    }
-};
-
-if (!process.env.TEST_URL) {
-    config.webServer = {
-        command: 'yarn start',
-        env: {
-            // TODO: Use `testing` when starting a server
-            NODE_ENV: 'development'
-        },
-        reuseExistingServer: !process.env.CI,
-        url: 'http://localhost:2368'
-    };
-}
-
-module.exports = config;