Commit Graph

11542 Commits

Author SHA1 Message Date
Hannah Wolfe
92446d85ea Changed member limit to be DRY & use raw query
- Member limit code was duplicated in 2 places unnecessarily
- Also used member api code that fetched members and subscriptions fully hyrated when we only need a count
- Using a raw query significantly improves performance here
2020-07-26 20:49:30 +01:00
Kevin Ansfield
0c5c7b32b8 Fixed members import regression tests
refs 14c6968388

- updates expected member labels length asserts to account for auto-generated import label being attached
2020-07-26 18:57:11 +01:00
Kevin Ansfield
14c6968388 Fixed auto-generated label not being attached to members during import
no issue

- label was being created and returned in the response OK but it was missing from the set of labels that get added to members during import
2020-07-26 18:30:58 +01:00
Renovate Bot
1f776e138f
Update dependency @sentry/node to v5.20.1 2020-07-24 17:47:22 +00:00
Renovate Bot
fdb04b086e
Update dependency @tryghost/members-ssr to v0.8.4 2020-07-24 14:02:00 +00:00
Fabien O'Carroll
8ac1e91d8b Bumbed @tryghost/members-api to 0.25.1
no-issue

This contains an update which ensures that we do not insert orphaned
rows into the database

Includes code from: https://github.com/TryGhost/Members/pull/190
2020-07-24 16:01:06 +02:00
Fabien O'Carroll
c46475f5be Supported optionally cancelling subscriptions on delete
no-issue

This updates the Admin API Member resource to *not* cancel subscriptions
by default, and adds a `cancel` option. This can be used over HTTP by
including a `cancel=true` query parameter.
2020-07-24 16:01:06 +02:00
Fabien O'Carroll
0ec28219f9 🐛 Fixed deleting members with deleted Stripe data
closes #11557

- Bumped @tryghost/members-api to 0.25.0
  - Fixed cancelling subscriptions which were already cancelled
  - Renamed exported subscriptions cancel fn from "destroy" -> "cancel"
2020-07-24 16:01:06 +02:00
Fabien O'Carroll
92151a7b5d Added default options to transactional model methods
no-issue

This protects against calling model methods without passing an options
object
2020-07-24 15:31:48 +02:00
Renovate Bot
97d797f97a
Update dependency @tryghost/magic-link to v0.4.12 2020-07-24 12:05:59 +00:00
Renovate Bot
1be849e835
Update dependency gscan to v3.5.5 2020-07-24 11:05:09 +00:00
Hannah Wolfe
3491e60c9d Added config to send bulk email in testmode
- mailgun has a testmode flag we can use to get email to be accepted but not delivered
- this is useful for developers testing general bulk email code - not for users - so it is only available via config
2020-07-24 11:55:34 +01:00
Fabien 'egg' O'Carroll
5144a0e09c
Updated Member model to cascade on destroy (#12077)
no-issue

Up until now we have left orphaned rows in members_stripe_* tables when
a member is deleted, this updates the destroy method so that we cascade
and remove any MemberStripeCustomer and StripeCustomerSubscription
models related to the Member.

This also adds regression tests for the new functionality as well as to
confirm the existing functionality of cascading to the members_labels
join table

This adds the relations of Subscription->Customer & Customer->Member
2020-07-23 18:21:10 +02:00
Rish
2ac69e637e Added publication icon to members site data
refs https://github.com/TryGhost/members.js/issues/72

- Portal is using using publication logo from settings for signup/signin pages
- Instead, we are switching to using publication icon from settings, which also needs to be passed in site data API
2020-07-23 17:04:44 +05:30
Kevin Ansfield
6504b0f6c3 Fixed settings unit tests
refs e04f55cce3

- added `tracker.uninstall()` so that previously set up `tracker.on()` listeners are not called by later tests
- fixed `emits edit events` test which was not correctly mocking the select and update queries
2020-07-22 22:12:00 +01:00
Kevin Ansfield
62c72cb58b Fixed oembed test
refs e04f55cce3

- added `nock.cleanAll()` so that there is no inter-test dependencies
- the failing test was successfully passing previously due to mocha's retry behaviour eventually exhausting nock request handlers that were set up in other tests and intended not to be called
2020-07-22 19:49:30 +01:00
Kevin Ansfield
b2798fef96 Removed mocha retries config
no issue

Retries can result in bogus error messages for any non-idempotent tests with multiple assertions, causing frustrating test debug experiences.

An example:

1. Members import test runs
2. Import succeeds, count assertions pass, assertion for "import label" presence fails
3. Mocha re-runs the test
4. "Imported member" count assertions now fail because the importer won't import duplicates and the db is not cleared for each individual test for performance
5. Mocha reports a test failure as the imported count being incorrect rather than the missing label
2020-07-22 18:16:36 +01:00
Kevin Ansfield
8ceabbcfba Added automatic labelling of all members added during an import
no issue

Having all members created during an import labelled with a specific "import label" is useful for later operations such as bulk delete/edit or simply recording how and when a member was created.

- automatically create a label with the date/time the members CSV import occurred and assign it to all imported members
- return the import label data in the API response so that clients can react accordingly such as automatically filtering the members list by the label once an import finishes
2020-07-22 17:52:43 +01:00
Daniel Lockyer
0fd6684d02 v3.26.1 2020-07-22 11:56:55 +01:00
Daniel Lockyer
5e45cd9155 Updated Ghost-Admin to v3.26.1 2020-07-22 11:56:55 +01:00
Rish
c6cbf9312c Bumped @tryghost/members-api to 0.24.5
refs https://github.com/TryGhost/Team/issues/342

This includes change for updating status code for `sendMagicLink` middleware failure from the actual error object
2020-07-22 16:20:24 +05:30
Fabien O'Carroll
daf38fa24f Bumped @tryghost/members-api to 0.24.4
refs #12074

This includes code to cleanup of any previous webhooks, to ensure that
we have no duplicates.
2020-07-22 12:31:09 +02:00
Fabien 'egg' O'Carroll
69080824de
🐛 Ensured webhooks are created once (#12075)
refs #12074

Since we've split members settings into multiple keys the
reconfiguration of the members-api has been happening in quick
succession as the stripe_connect_* settings are all set at once.

This debounces the call to reconfigure the members-api so that we only
need to instantiate it once.
2020-07-22 12:27:05 +02:00
Daniel Lockyer
415696a3f9 Replaced removed nock method
no issue
2020-07-21 20:25:06 +01:00
Renovate Bot
12b2582088 Update Test & linting packages 2020-07-21 20:25:06 +01:00
Renovate Bot
26d2fb662e Update dependency juice to v7 2020-07-21 20:10:20 +01:00
Renovate Bot
d949057a8b Update dependency uuid to v8.2.0 2020-07-21 19:10:09 +01:00
Daniel Lockyer
82dcc042cd Added coffeescript to dev dependencies
refs https://github.com/gruntjs/grunt/pull/1675

- Grunt 1.2.0 removed coffeescript as a dependency, opting to leave it
  to the users to install
- we use `grunt-bg-shell`, which is built in coffeescript and therefore
  needs the dependency else `grunt dev` doesn't work
- I don't like needing to add coffeescript but it'll do until we give
  the dev experience a good cleanup
2020-07-21 19:09:31 +01:00
Renovate Bot
91013bfcd6 Update dependency grunt-contrib-uglify to v5 2020-07-21 18:59:37 +01:00
Renovate Bot
58fcf70f23 Update dependency sanitize-html to v1.27.1 2020-07-21 17:54:29 +00:00
Renovate Bot
80603e218c Update dependency netjet to v1.4.0 2020-07-21 17:36:24 +00:00
Renovate Bot
9587af5dd0 Update dependency grunt to v1.2.1 2020-07-21 17:04:24 +00:00
Renovate Bot
d0b9d6be0c Update dependency @sentry/node to v5.20.0 2020-07-21 16:31:12 +00:00
Daniel Lockyer
4c9e9313d8 Updated Renovate config
no issue
2020-07-21 16:51:59 +01:00
Daniel Lockyer
55948ef4a6 v3.26.0 2020-07-21 13:45:57 +01:00
Daniel Lockyer
38f3e3ff03 Updated Ghost-Admin to v3.26.0 2020-07-21 13:45:56 +01:00
Daniel Lockyer
79c04459c2 Updated Casper to v3.0.13 2020-07-21 13:45:56 +01:00
Fabien O'Carroll
73badf150f 🐛 Fixed race condition when configuring Stripe
closes #12065

Includes the code from https://github.com/TryGhost/Members/pull/185
2020-07-21 14:22:06 +02:00
Fabien O'Carroll
0fe80edc0a 🐛 Fixed Stripe Subscriptions with trail periods
no-issue

This fixes a problem when subscribing to a Plan (Price) with a default
trial period. We also add logging to add a little more information about
which flow we're entering.

Subscriptions that are started with a trial have a
present on the Checkout Session object, which was incorrectly causing us
to determine that we are in a setup flow and attempt to update a
customers card details.

We now use the  property of the Checkout Session to determine
whether we are handling a new Subscription, or if we are in a setup
flow and should update the Customer's card details.

Includes the code from https://github.com/TryGhost/Members/pull/184
2020-07-21 14:22:06 +02:00
Fabien O'Carroll
1822e5d23e 🐛 Fixed webhook cleanup to handle older URLs
closes #12061

Includes the code from https://github.com/TryGhost/Members/pull/181
2020-07-21 14:22:06 +02:00
Renovate Bot
09ff9cd331
Update dependency @tryghost/members-ssr to v0.8.3 2020-07-21 11:48:24 +00:00
Hannah Wolfe
995a4eb46e 🐛 Fixed edit link for staff members
closes #12069

- the url in admin changed from team to staff, and wasn't updated in the frontend
2020-07-21 12:28:50 +01:00
Renovate Bot
3f08443e26
Update dependency @tryghost/magic-link to v0.4.11 2020-07-21 10:05:00 +00:00
Rish
3d164d222b Updated error name check in GhostMailer
no issue
refs e8511d0568

- Adds extra check for empty `err` object while checking error name for status code in GhostMailer
2020-07-21 01:08:19 +05:30
Rish
e8511d0568 Updated error code for incorrect recipients in GhostMailer
no issue

- By default, GhostMailer throws EmailError with statusCode as `500` for any failure in sending mail
- In case of failure due to `RecipientError`, status code as now correctly sent as `400` as its a bad request and not an error we can't handle.
2020-07-21 01:05:21 +05:30
Fabien 'egg' O'Carroll
6232981be7
🐛 Fixed importing Stripe Plans with amount 0 (#12062)
closes #12049

Stripe plans used to default to 0, and our new validation of plan
amounts were causing issues when importing from an older version of
Ghost, this updates the validation to be skipped when importing.

- Added regression test for importing plans
2020-07-20 14:59:23 +02:00
Renovate Bot
b3aec95230
Update dependency express-hbs to v2.3.4 2020-07-20 10:57:49 +00:00
Daniel Lockyer
d261f88456 Fixed typos in webhook error message
no issue
2020-07-20 09:05:56 +01:00
Renovate Bot
32a043c27c
Update dependency eslint to v7.5.0 2020-07-20 05:35:46 +00:00
Rish
90b39fbb9a Updated status and error message for newsletter email failures
refs https://github.com/TryGhost/Ghost/issues/11971

- Added statusCode from bulk email provider to API response
- Updated error messages for different bulk email(mailgun) failure states
- Added `context` to preview mail API error message with mail provider's error message
2020-07-17 13:54:09 +05:30