Alberto Fernández Capel
30b935befd
Prevent double rendering error
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
d1b1e6c299
Do not include the Licence ending in domain invites
...
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
5e70825c94
Rename view variable to invite
...
Makes the meaning more explicit
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
959db80177
Check all emails to prevent invite duplicates
2018-06-07 12:49:46 +01:00
Alberto Fernández Capel
1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +01:00
Alberto Fernández Capel
553878064b
Resend email if the user has already been invited
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
16cb5e0d35
Propagate the error further up the stack
...
Useful for error reporting and metrics.
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
e753ef3af5
Invite users in the invited_emails array
...
We'll remove that attribute soon, but for the time being we want
users to still be able to join the team.
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01:00
Jessica Lawshe
10cf5825a5
Add plans variant
...
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “
Also, move repeated elements to partials
2018-06-04 14:42:26 -05:00
Alberto Fernández Capel
58c4e72b2a
Update references to UserLocator
...
UserLocator was refactored in another branch: UserLocator -> UserGetter
2018-06-01 16:53:16 +01:00
Alberto Fernández Capel
25d7196570
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-01 16:49:47 +01:00
Alberto Fernández Capel
b0b2546e43
Remove dead code
2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
7fcdf68296
Remove dead code
2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db
Add some tests
2018-06-01 15:37:09 +01:00
Alberto Fernández Capel
385fec1914
Clean up code that uses invited_emails
2018-06-01 11:23:25 +01:00
Alberto Fernández Capel
1c485c1884
Improve error handling
2018-05-31 16:42:09 +01:00
Alberto Fernández Capel
d262de14d6
Use team invites to join domain licensed teams
2018-05-31 16:15:47 +01:00
Alberto Fernández Capel
39c8595c27
Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin
...
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
2018-05-31 14:25:47 +01:00
Alberto Fernández Capel
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +01:00
Alberto Fernández Capel
9aa95cb0d5
Show team invites
2018-05-30 13:06:27 +01:00
Alberto Fernández Capel
7e09c0e0b1
First stab at email token invites (WIP)
2018-05-30 11:29:21 +01:00
Tim Alby
5fbe5c5537
remove UserLocator
...
Use UserGetter instead
2018-05-28 14:11:13 +02:00
Tim Alby
bbaca91e57
add UserGetter#getUserByMainEmail
...
Use only that method to find users by email.
2018-05-28 14:11:09 +02:00
James Allen
50bd60dd51
Split FeaturesUpdater out of SubscriptionUpdater
2018-05-22 10:05:08 +01:00
James Allen
0830c473ad
Update unit tests and refactor to make more testable
2018-05-22 10:05:08 +01:00
James Allen
4deaf7865d
Guard against no apis.v1 setting
2018-05-22 10:05:08 +01:00
James Allen
b1f378208d
Properly merge subscriptions from different places
2018-05-22 10:05:08 +01:00
Hayden Faulds
304a6bc332
use ProjectGetter rather than Project directly
2018-02-16 08:55:09 +00:00
Alberto Fernández Capel
a81b56556f
Add test for SubscriptionViewModelBuilder
2018-01-09 17:00:56 +00:00
Alberto Fernández Capel
6d007bfe74
DRY logic to get subscription from Recurly
...
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736
Fix subscription page for members of a group
...
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.
SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
2018-01-05 16:28:49 +00:00
Shane Kilkelly
56ec81bb3e
Change 'oveleafPlanCode' to 'v1PlanCode'
2017-12-18 13:52:37 +00:00
Shane Kilkelly
eefe56d0f7
Fix up error handling in SubscriptionUpdater
2017-12-08 11:37:24 +00:00
Shane Kilkelly
a675e774b8
Fix how the getOverleafPlanCode integration is done
2017-12-08 11:29:11 +00:00
Shane Kilkelly
3adbc52089
Add a method to explicitely refresh subscription feature
2017-12-07 16:28:07 +00:00
Shane Kilkelly
4e86a03b46
Fix a problem with the order of module initialization
2017-12-07 15:06:32 +00:00
Shane Kilkelly
e7d8848a6a
Include possible overleaf subscription in feature setting
2017-12-04 15:12:26 +00:00
Shane Kilkelly
cc9986cefd
Remove the obsolete update-billing-details page
2017-11-28 11:52:14 +00:00
Shane Kilkelly
22c163c60a
Move the recurly-billing-details link up to main subscription page
2017-11-28 11:40:48 +00:00
Shane Kilkelly
c121653dc4
Add error-handling to attempt to get user subscription
2017-11-23 16:22:57 +00:00
Shane Kilkelly
caa65dddc1
Send user to hosted recurly billing-details page.
...
And remove our update-billing-details form, the APIs for which will be
deprecated soon.
2017-11-23 16:16:13 +00:00
Shane Kilkelly
069f49d5a6
Change getCollaboratorCount to getInvitedCollaboratorCount.
...
And update the one call-site in LimitationsManager. This function
is used to limit invites, so it makes sense to explicitely limit
this to Invited members of the project.
2017-09-20 10:29:47 +01:00
James Allen
10f362a77a
Add SubscriptionUpdater.deleteSubscription
2017-08-02 09:59:45 +02:00
Shane Kilkelly
8e55b77055
Move recurly callback to the public api router.
2017-07-20 13:51:11 +01:00
Henry Oswald
3da5ef818c
null check subscription for group admin panel
2017-06-22 14:07:07 +01:00
James Allen
4cecbae6b6
Use an email based invite system for groups, not holding accounts
2017-06-08 12:12:08 +01:00
Shane Kilkelly
01ee104f77
Revert "update to newest mongoose"
...
This reverts commit 7b05891ba0e87e4cf00fd6b1ea87d7406dc70989.
2017-05-10 15:31:17 +01:00
Shane Kilkelly
c5c0364d49
update to newest mongoose
2017-05-08 16:09:59 +01:00
James Allen
08699d7aa2
Handle a 404 from Recurly if account doesn't exist
2017-03-28 15:46:58 +01:00
