Commit Graph

146 Commits

Author SHA1 Message Date
June Kelly 02bb2f1c5a Merge pull request #6181 from overleaf/jk-fix-sub-handler-xml-exception
[web] Catch XML errors in RecurlyWrapper

GitOrigin-RevId: bc20146b67e0ceac76f21b5d28ea2b36e2e97f0d
2022-01-13 09:03:23 +00:00
Thomas 5e61fce3b4 Enable additional currencies when purchasing (or upgrading to) a group plan (#4884)
* Add script to fetch group data pricing from Recurly

* Update groups pricing data using script to fetch prices from Recurly

* Add additional currencies to saas settings

* Refactor group plans upgrade modal to use shared options from settings

GitOrigin-RevId: 6d13d5b152d01e0399f9d2b8f6f8bf99784589e8
2022-01-12 09:03:21 +00:00
Alf Eaton 50df230846 [web] Upgrade Prettier to match version in monorepo root (#6231)
GitOrigin-RevId: 02f97af1b9704782eee77a0b7dfc477ada23e34d
2022-01-11 09:03:23 +00:00
Thomas f88d63c54a Merge pull request #6137 from overleaf/jpa-cleanup-cb-based-interface
[web] SubscriptionLocator: do not return promises from cb-based methods

GitOrigin-RevId: afbdbf77ea672064d791915ac4119e4b6f5cce74
2021-12-20 09:03:18 +00:00
Jakob Ackermann 7954326711 Merge pull request #6136 from overleaf/jpa-fix-promise-vs-cb
[web] use promise based interface for getting the recurly subscription

GitOrigin-RevId: cb9409a824aa3df0f3a2def39237020227612eab
2021-12-15 09:05:52 +00:00
Timothée Alby 5eed78a3e8 Merge pull request #6099 from overleaf/jpa-recurly-redirect
[web] put hosted recurly pages behind a redirect

GitOrigin-RevId: 51a45dbcc0b74f1f1ae14eda9ed19a733e2d1334
2021-12-15 09:05:27 +00:00
Eric Mc Sween 5fc6d7dcb3 Merge pull request #5740 from overleaf/em-gcp-logging-web
Improve GCP logging for web

GitOrigin-RevId: b304c87a3fe46c29189f665eb3daf22c23d6eb8f
2021-11-11 09:03:09 +00:00
Alexandre Bourdin 7836743754 Merge pull request #5717 from overleaf/ab-sub-controller-uncaught-ex
Prevent uncaught error in SubscriptionController

GitOrigin-RevId: af8e986ce4c83c48d4af2a4af092c63eea092335
2021-11-09 09:04:58 +00:00
Alexandre Bourdin c881909258 Merge pull request #5716 from overleaf/ab-tear-down-de-ng-plans-page-test
Tear down de-ng split test and cleanup old version

GitOrigin-RevId: 02438bbb2e530dfe72f046dd91c547d97c39c96e
2021-11-09 09:04:51 +00:00
Jakob Ackermann 6122520bf5 Merge pull request #5727 from overleaf/jpa-deprecation-warnings
[misc] fix deprecation warnings

GitOrigin-RevId: aa103252e5918143bb1dacb19e87e47bb1784e83
2021-11-09 09:04:44 +00:00
Jakob Ackermann 71b5a4938d Merge pull request #5620 from overleaf/jpa-true-pro-features-override
[web] creating a professional feature override should populate all flags

GitOrigin-RevId: e5ee4464ac2cedac7cc919195ac2a4240fb9285f
2021-11-03 09:03:01 +00:00
Eric Mc Sween e5676a9643 Merge pull request #5648 from overleaf/em-revert-gcp-logging-web
Revert "Improve GCP logging for web"

GitOrigin-RevId: 92d446baf62108da1df92146eec12a2fe69d30ee
2021-11-02 09:03:29 +00:00
Eric Mc Sween 641b10cceb Merge pull request #5632 from overleaf/em-gcp-logging-web
Improve GCP logging for web

GitOrigin-RevId: 1198fab2e821a55563058171cfa435605216e337
2021-11-02 09:03:22 +00:00
Jakob Ackermann 7f9fd00bda Merge pull request #5367 from overleaf/jpa-node-handle-callback-err
[misc] fix eslint violations for node/handle-callback-err

GitOrigin-RevId: 83a4900e8861010df1917bff49382bd9c93375bd
2021-10-28 08:03:26 +00:00
June Kelly 12b90cac69 Merge pull request #5541 from overleaf/jk-retry-v1-requests-features-refresh
[web] Retry v1 requests in refresh-features path

GitOrigin-RevId: 1b0e952390d3de07fdfb115349a8a55965aabe1f
2021-10-28 08:03:20 +00:00
Brian Gough e681c6322f Merge pull request #5479 from overleaf/bg-refresh-features-on-editor-load
refresh user features on editor load when out of date

GitOrigin-RevId: ef39b5626cfdc6ed611137a6f6eca3417d3ce73f
2021-10-27 08:03:22 +00:00
Jakob Ackermann a6f05109a3 Merge pull request #5352 from overleaf/jpa-no-var
[misc] fix eslint violations for `no-var`

GitOrigin-RevId: c52e82f3a8a993b8662cc5aa56e7b95ca3c55832
2021-10-27 08:03:00 +00:00
Alexandre Bourdin 2037adf808 Add new scheduled-jobs queue dedicated to delayed jobs (#5496)
* Add new scheduled-jobs queue dedicated to delayed jobs

* Extract createScheduledJob and enqueue to a dedicated QueueHandler

* Queues cleanup & refactoring (review suggestions)

GitOrigin-RevId: f7b9380388430e878def83cd44e7d086d0fb92ad
2021-10-26 08:03:17 +00:00
Brian Gough d2c76b05cf Merge pull request #5425 from overleaf/bg-add-feature-override-script
add feature override script

GitOrigin-RevId: 90def174b4ac182b6f62984e8f9621f3dc16b92d
2021-10-14 08:03:18 +00:00
Hugh O'Brien 035b803989 Merge pull request #5154 from overleaf/hb-trial-onboarding-ab
Trial onboarding email

GitOrigin-RevId: a9e3ba5a5e333c625b4f983012f81f6fde21b8dc
2021-09-29 08:03:18 +00:00
Jakob Ackermann 59d83c4b88 Merge pull request #5117 from overleaf/jpa-plans-de-ng
[web] de-ng plans page

GitOrigin-RevId: b902b10b45ab3fd46e71545c94f65e8f079c4564
2021-09-23 08:03:23 +00:00
Eric Mc Sween 2fdff8288b Merge pull request #5088 from overleaf/em-queue-feature-refreshes
Perform some user refreshes in the background

GitOrigin-RevId: 3aec73c827bf0f7de7bd9caa369dfc653eac5dd0
2021-09-21 08:03:13 +00:00
Eric Mc Sween 0f7bfe9173 Merge pull request #5087 from overleaf/em-promisify-subscription-updater
Promisify FeaturesUpdater and SubscriptionHandler

GitOrigin-RevId: 1a9725afa119c0eaee3d975a11197b6f702f1307
2021-09-21 08:03:10 +00:00
Timothée Alby 931760629b Merge pull request #5122 from overleaf/ta-trial-extended-event
Add Subscriptions Trial Extended Event

GitOrigin-RevId: 3fe64f58fbab27e35c417fa2fe9880f883385ad2
2021-09-17 08:03:16 +00:00
Thomas 895f52d41a Let users upgrade to group plans via subscription dashboard (#5100)
* Let users upgrade to group plans via subscription dashboard

Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: 10664bd19af2c3870dfe7e19fd0f9c5b7c877cc6
2021-09-15 08:04:00 +00:00
Hugh O'Brien f7900b474b Merge pull request #4799 from overleaf/hb-eslint-rules
Re-enable some eslint rules

GitOrigin-RevId: 16153adb839bb61784bb40fbc8e43da281fe090d
2021-09-15 08:03:43 +00:00
Alexandre Bourdin 3577f25ba2 Merge pull request #5051 from overleaf/ab-web-mono-analytics-id
Analytics ID Support (v2)

GitOrigin-RevId: 707f62697f6566d8aad22e424684d97f7bc147df
2021-09-13 08:03:14 +00:00
Alexandre Bourdin 5b8de28250 Merge pull request #5050 from overleaf/revert-4639-ab-web-mono-analytics-id
Revert "Analytics ID support"

GitOrigin-RevId: cc5da762ba1bafcbcea65ed0dd86342896b6d1eb
2021-09-10 08:04:47 +00:00
Alexandre Bourdin 6dd641e0e6 Merge pull request #4639 from overleaf/ab-web-mono-analytics-id
Analytics ID support

GitOrigin-RevId: 820a6c0f4d19f046f6c791ce4dc64dbc80748924
2021-09-10 08:04:31 +00:00
Thomas 8ec01f59da Revert "Let users upgrade to group plans via subscription dashboard (#4704)" (#5047)
This reverts commit f310eb10ef00d43076981589ee45893e7d9ab881.

GitOrigin-RevId: 63d884d60d63b9ad47ffc15f688dc81fc7c3d77a
2021-09-10 08:04:24 +00:00
Thomas 5f550b0a11 Let users upgrade to group plans via subscription dashboard (#4704)
Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: f310eb10ef00d43076981589ee45893e7d9ab881
2021-09-10 08:04:18 +00:00
Alexandre Bourdin ffb30435d8 Merge pull request #4825 from overleaf/ab-cleanup-sub-page-split-test
Cleanup subscription page split test and set variant as new copy

GitOrigin-RevId: b7a19cf5f744d9181b71200351dc5a92db939e92
2021-09-01 08:03:01 +00:00
Jakob Ackermann 4a0af3abef Merge pull request #4874 from overleaf/jpa-web-recurly-unhandled
[web] emit error object instead of string from RecurlyWrapper.apiRequest

GitOrigin-RevId: 9fd6cac0b763a438063fdeb1f06bdaa4920024d9
2021-08-26 08:02:50 +00:00
June Kelly 8aeb782791 Merge pull request #4672 from overleaf/sk-validate-currency-param
Subscription: validate currency in query param
GitOrigin-RevId: 0c9f841ba56b5ce85bbd2adeb3fb2d45d0ad753a
2021-08-25 08:03:20 +00:00
Jessica Lawshe 379d9ac41c Merge pull request #4659 from overleaf/jel-em-duplicate-subscription-message
One Pro message per current commons institutions

GitOrigin-RevId: 21b74af8b9da1b6647a0384115f5d268b80e4bdf
2021-08-17 08:03:44 +00:00
Jessica Lawshe c0b27c4524 Merge pull request #4719 from overleaf/jel-user-features-refresh
Fix featuresChanged flag

GitOrigin-RevId: 1290f9b2b43cae2f1c4912df649800453ca20344
2021-08-17 08:03:32 +00:00
Alexandre Bourdin 9468e5cb4f Merge pull request #4338 from overleaf/ab-session-manager
Extract functions from AuthenticationController to SessionManager

GitOrigin-RevId: 86870ce03a762e1a837dcf493759e8851e759883
2021-07-28 12:36:22 +00:00
Jakob Ackermann 9dccd6173a Merge pull request #4305 from overleaf/jpa-fix-undef
[misc] fix undefined references in all the places and enable lint rule

GitOrigin-RevId: 473dbab577b34f60d6a3fe567e29e13cb5b1cb24
2021-07-14 12:40:42 +00:00
Jakob Ackermann 5e773ce950 Merge pull request #4101 from overleaf/ae-settings-module
Migrate from `settings-sharelatex` to `@overleaf/settings`

GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
2021-07-08 02:08:28 +00:00
Alexandre Bourdin 40c7f2dae1 Merge pull request #4219 from overleaf/ab-group-subscription-user-property
Send group subscription user property

GitOrigin-RevId: d1033ab4e0b5061b9d4a781e319d6b690f7e6154
2021-07-06 02:05:54 +00:00
Thomas be73463e35 Merge pull request #4248 from overleaf/tm-ta-new-subscription-currency-fixes
Fix getCurrencyCode behavior and add fallback in frontend for invalid currencies

GitOrigin-RevId: 5cc40b524148f88c0f110d2cf4bb4d3b69844f1b
2021-06-24 02:07:14 +00:00
Alexandre Bourdin c370785510 Merge pull request #4216 from overleaf/ab-mixpanel-events-cleanup
Cleanup analytics subscription events

GitOrigin-RevId: b55debe0d76f5e2d84e12de9cced8f69a03b8b95
2021-06-17 02:09:50 +00:00
Alexandre Bourdin 9f1784b4c4 Merge pull request #4200 from overleaf/ab-feature-set-user-property
Resolve and send feature set user property to analytics

GitOrigin-RevId: 08ddd0fe9202b02f7d37547dab1d078bf441a8cf
2021-06-17 02:09:46 +00:00
Alexandre Bourdin bb760a3ee2 Merge pull request #4186 from overleaf/ab-expired-sub-plan-code-prop
Keep subscription plan code user property when a subscription expires

GitOrigin-RevId: 195bfa440dc3fb020f4cbefe44f87bc975aade70
2021-06-12 02:08:44 +00:00
Alexandre Bourdin ca1e828ea7 Merge pull request #4138 from overleaf/ab-recurly-webhook-analytics
Send analytics events and user properties from Recurly webhook

GitOrigin-RevId: 3227dd9e42bad61e17d2ca471f6d68adb7212dab
2021-06-11 02:05:59 +00:00
Thomas d56d4c3b4a Add HTTP Basic Auth to Recurly webhook endpoint (#4054)
* Add HTTP authentication to Recurly webhook endpoint

Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: 81c32459d643895c096bc195ae6aef53248418da
2021-06-09 02:05:31 +00:00
Jakob Ackermann 95c83866c5 Merge pull request #4112 from overleaf/tm-private-api-basic-auth
Add requireBasicAuth middleware and refactor httpAuth to use it

GitOrigin-RevId: 7f68c0dc4a40102bfe4a97711def517e465ec7fd
2021-06-01 02:05:46 +00:00
Alexandre Bourdin a65c5dde01 Merge pull request #4068 from overleaf/ab-split-test-user-properties
Store assigned split tests as user properties

GitOrigin-RevId: 1cc09d4d8f19badb73e87c46064bdeac131dd307
2021-05-27 02:06:10 +00:00
Alexandre Bourdin 18d62dcee9 Merge pull request #4071 from overleaf/ab-subscription-decaf-cleanup
Subscription controller decaf cleanup

GitOrigin-RevId: 79b8adfabe30e4557a95b1aad71a5162e6f42cce
2021-05-27 02:06:03 +00:00
Timothée Alby 03b2d184b5 Merge pull request #4052 from overleaf/ab-subscription-page-split-test-2
Subscription page split test

GitOrigin-RevId: 022a91d97f20d584e47e1f6b5575e689983df129
2021-05-20 02:05:00 +00:00