Skip to content

Commit 6526b15

Browse files
committed
Moved @tryghost/magic-link to core folder
fix https://linear.app/ghost/issue/ENG-2378/magic-link - this commit moves the lib code and tests to the core folder so we can colocate code in one place rather than splitting it out across packages, which increases the cognitive load and overhead
1 parent 9ba11b8 commit 6526b15

File tree

13 files changed

+7
-53
lines changed

13 files changed

+7
-53
lines changed

ghost/magic-link/README.md renamed to ghost/core/core/server/services/lib/magic-link/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
```js
66
const crypto = require('crypto');
77
const nodemailer = require('nodemailer');
8-
const MagicLink = require('@tryghost/magic-link');
8+
const MagicLink = require('./MagicLink');
99

1010
async function main() {
1111
const jwtSecret = crypto.randomBytes(16).toString('hex');

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const {Router} = require('express');
22
const body = require('body-parser');
3-
const MagicLink = require('@tryghost/magic-link');
43
const errors = require('@tryghost/errors');
54
const logging = require('@tryghost/logging');
65

@@ -16,6 +15,7 @@ const MemberController = require('./controllers/MemberController');
1615
const WellKnownController = require('./controllers/WellKnownController');
1716

1817
const {EmailSuppressedEvent} = require('../../email-suppression-list/EmailSuppressionList');
18+
const MagicLink = require('../../lib/magic-link/MagicLink');
1919
const DomainEvents = require('@tryghost/domain-events');
2020

2121
module.exports = function MembersAPI({

ghost/core/core/server/services/newsletters/NewslettersService.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
const _ = require('lodash');
2-
const MagicLink = require('@tryghost/magic-link');
32
const logging = require('@tryghost/logging');
43
const verifyEmailTemplate = require('./emails/verify-email');
54
const debug = require('@tryghost/debug')('services:newsletters');
65
const tpl = require('@tryghost/tpl');
76
const errors = require('@tryghost/errors');
7+
88
const sentry = require('../../../shared/sentry');
9+
const MagicLink = require('../lib/magic-link/MagicLink');
910

1011
const messages = {
1112
nameAlreadyExists: 'A newsletter with the same name already exists',

ghost/core/core/server/services/settings/SettingsBREADService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ const tpl = require('@tryghost/tpl');
33
const {NotFoundError, NoPermissionError, BadRequestError, IncorrectUsageError, ValidationError} = require('@tryghost/errors');
44
const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./settings-utils');
55
const logging = require('@tryghost/logging');
6-
const MagicLink = require('@tryghost/magic-link');
76
const verifyEmailTemplate = require('./emails/verify-email');
7+
const MagicLink = require('../lib/magic-link/MagicLink');
88
const sentry = require('../../../shared/sentry');
99

1010
const EMAIL_KEYS = ['members_support_address'];

ghost/core/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
"@tryghost/limit-service": "1.2.15",
101101
"@tryghost/link-replacer": "0.0.0",
102102
"@tryghost/logging": "2.4.21",
103-
"@tryghost/magic-link": "0.0.0",
104103
"@tryghost/member-attribution": "0.0.0",
105104
"@tryghost/member-events": "0.0.0",
106105
"@tryghost/members-csv": "0.0.0",

ghost/magic-link/test/index.test.js renamed to ghost/core/test/unit/server/services/lib/magic-link/index.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const assert = require('assert/strict');
22
const sinon = require('sinon');
3-
const MagicLink = require('../');
3+
const MagicLink = require('../../../../../../core/server/services/lib/magic-link/MagicLink');
44
const crypto = require('crypto');
55

66
const sandbox = sinon.createSandbox();

ghost/email-addresses/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"build"
2323
],
2424
"devDependencies": {
25+
"@types/nodemailer": "6.4.17",
2526
"c8": "8.0.1",
2627
"mocha": "10.8.2",
2728
"sinon": "15.2.0",

ghost/magic-link/.eslintrc.js

-6
This file was deleted.

ghost/magic-link/index.js

-1
This file was deleted.

ghost/magic-link/package.json

-34
This file was deleted.

ghost/magic-link/test/.eslintrc.js

-6
This file was deleted.

0 commit comments

Comments
 (0)