ghost 5.130.0 → 6.0.0-alpha.1

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

@@ -722,7 +722,7 @@
             "name": "User",
             "entries": [
                 {
-                    "id": 1,
+                    "id": "__OWNER_USER_ID__",
                     "name": "Ghost",
                     "email": "ghost@example.com",
                     "status": "inactive",
@@ -746,8 +746,7 @@
                     "type": "post",
                     "status": "published",
                     "visibility": "public",
-                    "created_by": "1",
-                    "published_by": "1"
+                    "published_by": "__OWNER_USER_ID__"
                 },
                 {
                     "title": "About this site",
@@ -757,8 +756,7 @@
                     "type": "page",
                     "status": "published",
                     "visibility": "public",
-                    "created_by": "1",
-                    "published_by": "1"
+                    "published_by": "__OWNER_USER_ID__"
                 }
             ]
         },
@@ -1023,7 +1021,7 @@
                 "match": "name"
             },
             "entries": {
-                "1": ["Owner"]
+                "__OWNER_USER_ID__": ["Owner"]
             }
         }
     ]

package/core/server/data/schema/fixtures/index.js

@@ -5,4 +5,6 @@ const fixturePath = config.get('paths').fixtures;
 const fixtures = require(fixturePath);
 
 module.exports.FixtureManager = FixtureManager;
-module.exports.fixtureManager = new FixtureManager(fixtures);
+module.exports.fixtureManager = new FixtureManager(fixtures, {
+    __OWNER_USER_ID__: models => models.User.generateId()
+});

package/core/server/data/schema/schema.js

@@ -1,9 +1,10 @@
 /* String Column Sizes Information
  * (From: https://github.com/TryGhost/Ghost/pull/7932)
- *
+ * New/Updated column maxlengths should meet these guidlines
+ * 
  * Small strings = length 50
  * Medium strings = length 191
- * Large strings = length 1000-2000
+ * Large strings = length 2000 (use soft limits via validation for 191-2000)
  * Text = length 65535 (64 KiB)
  * Long text = length 1,000,000,000
  */
@@ -85,14 +86,7 @@ module.exports = {
             nullable: false
         },
         created_at: {type: 'dateTime', nullable: false},
-        /**
-         * @deprecated: https://github.com/TryGhost/Ghost/issues/10286
-         *
-         * This is valid for all x_by fields.
-         */
-        created_by: {type: 'string', maxlength: 24, nullable: false},
         updated_at: {type: 'dateTime', nullable: true, index: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true},
         published_at: {type: 'dateTime', nullable: true, index: true},
         published_by: {type: 'string', maxlength: 24, nullable: true},
         custom_excerpt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 300}}},
@@ -122,7 +116,7 @@ module.exports = {
         meta_description: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 500}}},
         email_subject: {type: 'string', maxlength: 300, nullable: true},
         frontmatter: {type: 'text', maxlength: 65535, nullable: true},
-        feature_image_alt: {type: 'string', maxlength: 191, nullable: true},
+        feature_image_alt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 191}}},
         feature_image_caption: {type: 'text', maxlength: 65535, nullable: true},
         email_only: {type: 'boolean', nullable: false, defaultTo: false}
     },
@@ -188,9 +182,7 @@ module.exports = {
         milestone_notifications: {type: 'boolean', nullable: false, defaultTo: true},
         donation_notifications: {type: 'boolean', nullable: false, defaultTo: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     posts_authors: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -203,9 +195,7 @@ module.exports = {
         name: {type: 'string', maxlength: 50, nullable: false, unique: true},
         description: {type: 'string', maxlength: 2000, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     roles_users: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -219,9 +209,7 @@ module.exports = {
         action_type: {type: 'string', maxlength: 50, nullable: false},
         object_id: {type: 'string', maxlength: 24, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     permissions_users: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -242,7 +230,6 @@ module.exports = {
             defaultTo: 'core',
             validations: {
                 isIn: [[
-                    'amp',
                     'core',
                     'email',
                     'labs',
@@ -276,9 +263,7 @@ module.exports = {
         },
         flags: {type: 'string', maxlength: 50, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     tags: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -307,9 +292,7 @@ module.exports = {
         canonical_url: {type: 'string', maxlength: 2000, nullable: true},
         accent_color: {type: 'string', maxlength: 50, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     posts_tags: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -334,9 +317,7 @@ module.exports = {
         email: {type: 'string', maxlength: 191, nullable: false, unique: true, validations: {isEmail: true}},
         expires: {type: 'bigInteger', nullable: false},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     brute: {
         key: {type: 'string', maxlength: 191, primary: true},
@@ -367,9 +348,7 @@ module.exports = {
         icon_image: {type: 'string', maxlength: 2000, nullable: true},
         description: {type: 'string', maxlength: 2000, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     webhooks: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -387,9 +366,7 @@ module.exports = {
         last_triggered_status: {type: 'string', maxlength: 50, nullable: true},
         last_triggered_error: {type: 'string', maxlength: 50, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     api_keys: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -413,9 +390,7 @@ module.exports = {
         last_seen_at: {type: 'dateTime', nullable: true},
         last_seen_version: {type: 'string', maxlength: 50, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     mobiledoc_revisions: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -435,13 +410,13 @@ module.exports = {
         post_status: {type: 'string', maxlength: 50, nullable: true, validations: {isIn: [['draft', 'published', 'scheduled', 'sent']]}},
         reason: {type: 'string', maxlength: 50, nullable: true},
         feature_image: {type: 'string', maxlength: 2000, nullable: true},
-        feature_image_alt: {type: 'string', maxlength: 191, nullable: true},
+        feature_image_alt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 191}}},
         feature_image_caption: {type: 'text', maxlength: 65535, nullable: true},
         custom_excerpt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 300}}}
     },
     members: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
-        uuid: {type: 'string', maxlength: 36, nullable: true, unique: true, validations: {isUUID: true}},
+        uuid: {type: 'string', maxlength: 36, nullable: false, unique: true, validations: {isUUID: true}},
         transient_id: {type: 'string', maxlength: 191, nullable: false, unique: true},
         email: {type: 'string', maxlength: 191, nullable: false, unique: true, validations: {isEmail: true}},
         status: {
@@ -461,9 +436,7 @@ module.exports = {
         last_seen_at: {type: 'dateTime', nullable: true},
         last_commented_at: {type: 'dateTime', nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
         updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true},
         '@@INDEXES@@': [
             ['email_disabled']
         ]
@@ -646,9 +619,7 @@ module.exports = {
         name: {type: 'string', maxlength: 191, nullable: false, unique: true},
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     members_labels: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -663,9 +634,7 @@ module.exports = {
         name: {type: 'string', maxlength: 191, nullable: true},
         email: {type: 'string', maxlength: 191, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     subscriptions: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -717,9 +686,7 @@ module.exports = {
         start_date: {type: 'dateTime', nullable: false},
         default_payment_card_last4: {type: 'string', maxlength: 4, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
         updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true},
         mrr: {type: 'integer', unsigned: true, nullable: false, defaultTo: 0},
         offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
         trial_start_at: {type: 'dateTime', nullable: true},
@@ -869,9 +836,7 @@ module.exports = {
         submitted_at: {type: 'dateTime', nullable: false},
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id'},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     email_batches: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -935,8 +900,7 @@ module.exports = {
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: true},
         first_used_at: {type: 'dateTime', nullable: true},
-        used_count: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
-        created_by: {type: 'string', maxlength: 24, nullable: false}
+        used_count: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
     },
     snippets: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -944,9 +908,7 @@ module.exports = {
         mobiledoc: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: false},
         lexical: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        created_by: {type: 'string', maxlength: 24, nullable: false},
-        updated_at: {type: 'dateTime', nullable: true},
-        updated_by: {type: 'string', maxlength: 24, nullable: true}
+        updated_at: {type: 'dateTime', nullable: true}
     },
     custom_theme_settings: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -1087,13 +1049,6 @@ module.exports = {
         created_at: {type: 'dateTime', nullable: false},
         email_sent_at: {type: 'dateTime', nullable: true}
     },
-    temp_mail_events: {
-        id: {type: 'string', maxlength: 100, nullable: false, primary: true},
-        type: {type: 'string', maxlength: 50, nullable: false},
-        message_id: {type: 'string', maxlength: 150, nullable: false},
-        recipient: {type: 'string', maxlength: 191, nullable: false},
-        occurred_at: {type: 'dateTime', nullable: false}
-    },
     collections: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         title: {type: 'string', maxlength: 191, nullable: false},

package/core/server/data/seeders/DataGenerator.js

@@ -88,6 +88,15 @@ class DataGenerator {
     async clearData(transaction) {
         const tables = this.tableList.map(t => t.name).reverse();
 
+        const ownerUser = await transaction('roles_users')
+            .join('roles', 'roles.id', 'roles_users.role_id')
+            .where('roles.name', 'Owner')
+            .first();
+
+        if (!ownerUser) {
+            this.logger.warn('Owner user not found, selective user clearing will not be possible');
+        }
+
         // TODO: Remove this once we import posts_meta
         tables.unshift('posts_meta');
 
@@ -96,10 +105,10 @@ class DataGenerator {
             this.logger.debug(`Clearing table ${table}`);
 
             if (table === 'roles_users') {
-                await transaction(table).del().whereNot('user_id', '1');
+                await transaction(table).del().whereNot('user_id', ownerUser?.user_id || null);
             } else if (table === 'users') {
                 // Avoid deleting the admin user
-                await transaction(table).del().whereNot('id', '1');
+                await transaction(table).del().whereNot('id', ownerUser?.user_id || null);
             } else {
                 await transaction(table).truncate();
             }

package/core/server/data/seeders/importers/EmailsImporter.js

@@ -89,9 +89,7 @@ class EmailsImporter extends TableImporter {
             submitted_at: dateToDatabaseString(timestamp),
             newsletter_id: newsletter.id,
             created_at: dateToDatabaseString(timestamp),
-            created_by: 'unused',
-            updated_at: dateToDatabaseString(timestamp),
-            updated_by: 'unused'
+            updated_at: dateToDatabaseString(timestamp)
         };
     }
 }

package/core/server/data/seeders/importers/LabelsImporter.js

@@ -31,9 +31,7 @@ class LabelsImporter extends TableImporter {
             name: name,
             slug: `${slugify(name)}`,
             created_at: dateToDatabaseString(blogStartDate),
-            created_by: '1',
-            updated_at: dateToDatabaseString(blogStartDate),
-            updated_by: '1'
+            updated_at: dateToDatabaseString(blogStartDate)
         };
     }
 }

package/core/server/data/seeders/importers/MembersImporter.js

@@ -102,7 +102,6 @@ class MembersImporter extends TableImporter {
             // 40% of users logged in within a week, 60% sometime since registering
             last_seen_at: luck(40) ? dateToDatabaseString(faker.date.recent(7)) : dateToDatabaseString(faker.date.between(timestamp, new Date())),
             created_at: dateToDatabaseString(timestamp),
-            created_by: id,
             updated_at: dateToDatabaseString(timestamp)
         };
     }

package/core/server/data/seeders/importers/MembersStripeCustomersImporter.js

@@ -51,8 +51,7 @@ class MembersStripeCustomersImporter extends TableImporter {
             })}`,
             name: this.model.name,
             email: this.model.email,
-            created_at: this.model.created_at,
-            created_by: 'unused'
+            created_at: this.model.created_at
         };
     }
 }

package/core/server/data/seeders/importers/MembersStripeCustomersSubscriptionsImporter.js

@@ -237,7 +237,6 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
             stripe_price_id: stripePrice.stripe_price_id,
             start_date: dateToDatabaseString(startDate),
             created_at: dateToDatabaseString(startDate),
-            created_by: 'unused',
             mrr,
             plan_id: stripeProduct.stripe_product_id,
             plan_nickname: `${ghostProduct.name} - ${stripePrice.nickname}`,

package/core/server/data/seeders/importers/PostsImporter.js

@@ -53,7 +53,6 @@ class PostsImporter extends TableImporter {
         return {
             id: this.fastFakeObjectId(),
             created_at: dateToDatabaseString(timestamp),
-            created_by: '1',
             updated_at: dateToDatabaseString(timestamp),
             published_at: status === 'published' ? dateToDatabaseString(timestamp) : status === 'scheduled' ? dateToDatabaseString(faker.date.soon(5, timestamp)) : null,
             uuid: faker.datatype.uuid(),

package/core/server/data/seeders/importers/RolesUsersImporter.js

@@ -14,7 +14,12 @@ class RolesUsersImporter extends TableImporter {
      * Ignore overriden quantity for 1:1 relationship
      */
     async import() {
-        const users = await this.transaction.select('id').from('users').whereNot('id', 1);
+        const ownerUser = await this.transaction('roles_users')
+            .join('roles', 'roles.id', 'roles_users.role_id')
+            .where('roles.name', 'Owner')
+            .first();
+
+        const users = await this.transaction.select('id').from('users').whereNot('id', ownerUser?.user_id || null);
         this.roles = await this.transaction.select('id', 'name').from('roles');
 
         await this.importForEach(users, 1);

package/core/server/data/seeders/importers/TagsImporter.js

@@ -32,8 +32,7 @@ class TagsImporter extends TableImporter {
             name: name,
             slug: slugify(name),
             description: faker.lorem.sentence(),
-            created_at: dateToDatabaseString(faker.date.between(threeYearsAgo, twoYearsAgo)),
-            created_by: this.users[faker.datatype.number(this.users.length - 1)].id
+            created_at: dateToDatabaseString(faker.date.between(threeYearsAgo, twoYearsAgo))
         };
     }
 }

package/core/server/data/seeders/importers/UsersImporter.js

@@ -22,8 +22,7 @@ class UsersImporter extends TableImporter {
             password: await security.password.hash(faker.color.human()),
             email: faker.internet.email(name),
             profile_image: faker.internet.avatar(),
-            created_at: dateToDatabaseString(faker.date.between(new Date(2016, 0), new Date())),
-            created_by: 'unused'
+            created_at: dateToDatabaseString(faker.date.between(new Date(2016, 0), new Date()))
         };
     }
 }

package/core/server/data/tinybird/README.md

@@ -31,7 +31,7 @@ with the following information.
 
 ### Config
 Sample config:
-```json
+```jsonc
 {
    "someOtherConfigurationForEmail": {
         "transport": "SMTP",
@@ -40,25 +40,20 @@ Sample config:
         }
     },
     "tinybird": {
+        "workspaceId": "workspace-id-from-tinybird",
+        "adminToken": "admin-token-from-tinybird",
         "tracker": {
-            "endpoint": "https://e.ghost.org/tb/web_analytics",
-            "token": "xxxxx",
-            "datasource": "analytics_events",
-            "local": {
-                "enabled": true,
-                "token": "xxxxx",
-                "endpoint": "http://localhost:7181/v0/events",
-                "datasource": "analytics_events"
-            }
+            // -- needs to be present, and required Traffic Analytics service running with correct setup
+            "endpoint": "http://localhost:3000/tb/web_analytics"
         },
         "stats": {
+            //  -- optional override for site uuid
+            // "id": "106a623d-9792-4b63-acde-4a0c28ead3dc",
             "endpoint": "https://api.tinybird.co",
-            "token": "xxxxx",
+            // -- tinybird local configuration (optional)
             "local": {
                 "enabled": true,
-                "token": "xxxxx",
-                "endpoint": "http://localhost:7181",
-                "datasource": "analytics_events"
+                "token": "local-stats-or-admin-token",
             }
         }
     }

package/core/server/models/base/bookshelf.js

@@ -54,7 +54,14 @@ ghostBookshelf.plugin(require('./plugins/bulk-operations'));
 
 ghostBookshelf.plugin(require('./plugins/filtered-collection'));
 
-ghostBookshelf.plugin(require('./plugins/user-type'));
+ghostBookshelf.plugin(require('./plugins/user-type'), {
+    resolveIntegrationUserId: function resolveIntegrationUserId(options) {
+        return ghostBookshelf.model('User').getOwnerId(options);
+    },
+    resolveInternalUserId: function resolveInternalUserId(options) {
+        return ghostBookshelf.model('User').getOwnerId(options);
+    }
+});
 
 ghostBookshelf.plugin(require('./plugins/data-manipulation'));
 

package/core/server/models/base/plugins/events.js

@@ -138,26 +138,12 @@ module.exports = function (Bookshelf) {
 
         /**
          * Adding resources implies setting these properties on the server side
-         * - set `created_by` based on the context
-         * - set `updated_by` based on the context
          * - the bookshelf `timestamps` plugin sets `created_at` and `updated_at`
          *   - if plugin is disabled (e.g. import) we have a fallback condition
          *
          * Exceptions: internal context or importing
          */
         onCreating: function onCreating(model, attr, options) {
-            if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_by')) {
-                if (!options.importing || (options.importing && !this.get('created_by'))) {
-                    this.set('created_by', String(this.contextUser(options)));
-                }
-            }
-
-            if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'updated_by')) {
-                if (!options.importing) {
-                    this.set('updated_by', String(this.contextUser(options)));
-                }
-            }
-
             if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_at')) {
                 if (!model.get('created_at')) {
                     model.set('created_at', new Date());
@@ -199,9 +185,7 @@ module.exports = function (Bookshelf) {
 
         /**
          * Changing resources implies setting these properties on the server side
-         * - set `updated_by` based on the context
          * - ensure `created_at` never changes
-         * - ensure `created_by` never changes
          * - the bookshelf `timestamps` plugin sets `updated_at` automatically
          *
          * Exceptions:
@@ -216,24 +200,12 @@ module.exports = function (Bookshelf) {
                 model.changed = _.omit(model.changed, this.relationships);
             }
 
-            if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'updated_by')) {
-                if (!options.importing && !options.migrating) {
-                    this.set('updated_by', String(this.contextUser(options)));
-                }
-            }
-
             if (options && options.context && !options.context.internal && !options.importing) {
                 if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_at')) {
                     if (model.hasDateChanged('created_at', {beforeWrite: true})) {
                         model.set('created_at', this.previous('created_at'));
                     }
                 }
-
-                if (Object.prototype.hasOwnProperty.call(schema.tables[this.tableName], 'created_by')) {
-                    if (model.hasChanged('created_by')) {
-                        model.set('created_by', String(this.previous('created_by')));
-                    }
-                }
             }
 
             // CASE: do not allow setting only the `updated_at` field, exception: importing

package/core/server/models/base/plugins/user-type.js

@@ -8,7 +8,7 @@ const messages = {
 /**
  * @param {import('bookshelf')} Bookshelf
  */
-module.exports = function (Bookshelf) {
+module.exports = function (Bookshelf, pluginOptions) {
     Bookshelf.Model = Bookshelf.Model.extend({
         getActor(options = {context: {}}) {
             if (options.context && options.context.integration) {
@@ -29,37 +29,22 @@ module.exports = function (Bookshelf) {
         },
 
         // Get the user from the options object
-        contextUser: function contextUser(options) {
+        contextUser: async function contextUser(options) {
             options = options || {};
             options.context = options.context || {};
 
             if (options.context.user) {
                 return options.context.user;
             } else if (options.context.integration) {
-            /**
-             * @NOTE:
-             *
-             * This is a dirty fix until we get rid of all the x_by columns
-             * @deprecated x_by columns are deprecated as of v1.0 - instead we should use the actions table
-             * see https://github.com/TryGhost/Ghost/issues/10286.
-             *
-             * We return the owner ID '1' in case an integration updates or creates resources.
-             *
-             * ---
-             *
-             * Why using ID '1'? WAIT. What???????
-             *
-             * See https://github.com/TryGhost/Ghost/issues/9299.
-             *
-             * We currently don't read the correct owner ID from the database and assume it's '1'.
-             * This is a leftover from switching from auto increment ID's to Object ID's.
-             * But this takes too long to refactor out now. If an internal update happens, we also
-             * use ID '1'. This logic exists for a LONG while now. The owner ID only changes from '1' to something else,
-             * if you transfer ownership.
-             */
-                return Bookshelf.Model.internalUser;
+                return pluginOptions.resolveIntegrationUserId({
+                    transacting: options.transacting,
+                    context: options.context
+                });
             } else if (options.context.internal) {
-                return Bookshelf.Model.internalUser;
+                return pluginOptions.resolveInternalUserId({
+                    transacting: options.transacting,
+                    context: options.context
+                });
             } else if (this.get('id')) {
                 return this.get('id');
             } else {
@@ -69,16 +54,5 @@ module.exports = function (Bookshelf) {
                 });
             }
         }
-    }, {
-        /**
-         * please use these static definitions when comparing id's
-         * we keep type Number, because we have too many check's where we rely on Number
-         * context.user ? true : false (if context.user is 0 as number, this condition is false)
-         */
-        internalUser: 1,
-
-        isInternalUser: function isInternalUser(id) {
-            return id === Bookshelf.Model.internalUser || id === Bookshelf.Model.internalUser.toString();
-        }
     });
 };