Shane Kilkelly
9a7c8c5842
Revert "Remove remaining traces of UserStub"
...
This reverts commit ab6b4c32254a20b940c489b8b5b56237433cc0f6.
2017-10-12 15:08:48 +01:00
Shane Kilkelly
16416463c6
Update removeUserFromProject to account for token-access
2017-10-12 11:49:02 +01:00
Shane Kilkelly
6e09165452
Refactor auth sources
2017-10-12 10:57:11 +01:00
Shane Kilkelly
d386f79a76
Clean up
2017-10-06 16:10:33 +01:00
Shane Kilkelly
91abb6eed6
If project is not tokenBased, don't count members of token arrays
2017-10-06 15:57:22 +01:00
Shane Kilkelly
ee32648bf4
Order privileges by highest-to-lowest
2017-09-22 15:55:38 +01:00
Shane Kilkelly
abe41b6948
Fix projection in project query
2017-09-21 13:37:10 +01:00
Shane Kilkelly
863d327743
Change logic to exclude token users
2017-09-21 11:02:55 +01:00
Shane Kilkelly
931ba56e33
Add an 'owner' source tag, for the project owner
2017-09-21 09:35:25 +01:00
Shane Kilkelly
ef7e1ceabf
Rename functions to make distinction between invited/token members
2017-09-21 09:30:38 +01:00
Shane Kilkelly
574baf386e
Alter getProjectsUserIsMemberOf to include token-access projects.
...
Also change the api to produce an object with the different project lists
attached, rather than a pair of lists.
2017-09-20 15:26:03 +01:00
Shane Kilkelly
ceb7c509d0
Rename getProjectsUserIsCollaboratorOf to ...IsMemberOf
...
This brings the naming more in line with current conventions.
2017-09-20 13:16:50 +01: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
Shane Kilkelly
8460160076
Add a getInvitedMembersWithPrivilegeLevels function.
...
Then use it to build the loadProject view-model.
2017-09-20 10:02:43 +01:00
Shane Kilkelly
cf54989e6a
Add a getInvitedMemberIds function
...
Limited to only members who were invited to the project, not users
who have access via a token.
2017-09-20 09:36:56 +01:00
Shane Kilkelly
06966f67db
Differentiate project members by source, include token members
2017-09-20 09:35:19 +01:00
Shane Kilkelly
a06f4b6b28
Remove remaining traces of UserStub
2017-09-19 16:16:39 +01:00
Shane Kilkelly
7919d5342b
Remove obsolete add-email-to-project workflow
2017-09-19 15:57:19 +01:00
Shane Kilkelly
3d0268a486
Add other required properties for project load.
2017-09-01 11:36:23 +01:00
Shane Kilkelly
68f860b28d
Load user features alongside id and email.
...
Fixes a bug where project features were not applied properly,
and instead fell back to the free-account defaults.
2017-09-01 11:16:45 +01:00
James Allen
d5839437fd
Add in UserStub model and support in collaborators view
2017-08-24 17:48:47 +02:00
James Allen
b086d7afa2
Refactor rate limiting code around sending invites
2017-01-27 16:26:58 +01:00
Henry Oswald
74240e28c7
rate limit via ip the number of invite to project requests
2017-01-21 12:44:09 +00:00
Henry Oswald
6d35585847
limit number of invites each user can do
...
done with the number of collaborators a user can add
prevents notifications getting filled up as well
2017-01-21 12:43:15 +00:00
Shane Kilkelly
82ddeab2bd
If user tries to invite themselves to project, don't.
2017-01-16 13:45:01 +00:00
Henry Oswald
fed88504f8
rate limit emails sent sharing projects by users
2017-01-14 14:52:32 +00:00
Shane Kilkelly
259c589076
Add option to restrict invites to existing user accounts.
2016-12-20 09:54:42 +00:00
Shane Kilkelly
4c092e7ff1
Remove deprecated "projectSharedWithYou" email.
2016-10-28 10:37:10 +01:00
Shane Kilkelly
b42a3b9188
Fix logging typo
2016-10-03 15:25:18 +01:00
Shane Kilkelly
72ca1d6316
Merge branch 'master' into sk-passport
...
# Conflicts:
# app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
2016-09-23 10:01:11 +01:00
James Allen
e15976be21
Use token in URL to force its precense when invite and allow easy dynamic notifications
2016-09-22 17:24:06 +01:00
James Allen
d904e50041
Make project invite notification dynamic and accept via ajax request
...
Needs translations:
"joining": "Joining",
"notification_project_invite_message": "<b>{{ userName }}</b> would like you to join <b>{{ projectName }}</b>",
"notification_project_invite_accepted_message": "You've joined <b>{{ projectName }}</b>",
"open_project": "Open Project"
2016-09-21 11:59:35 +01:00
James Allen
a93c939dbc
Send invite email and notification in the background
2016-09-21 10:11:35 +01:00
Shane Kilkelly
cc5ddc92bb
use getSessionUser rather than getLoggedInUser
2016-09-07 10:30:58 +01:00
Shane Kilkelly
749658a916
WIP: fixing acceptance tests
2016-09-06 13:21:22 +01:00
Shane Kilkelly
ab2c1e82fb
WIP: refactor
2016-09-05 15:58:31 +01:00
Henry Oswald
130fece0f6
track when users accept invites
2016-08-19 18:33:03 +01:00
Shane Kilkelly
ece0491e3d
Refactor. Handle republishing of notifications on resend.
2016-08-17 16:27:15 +01:00
Shane Kilkelly
d2183738c5
Improve logging for debugging
2016-08-16 09:04:11 +01:00
Shane Kilkelly
f92767f7b5
Address feedback, add ? checks where appropriate
2016-08-12 15:26:20 +01:00
Shane Kilkelly
ce039f8cd3
Remove the email when user id is added to project
2016-08-11 14:17:01 +01:00
Shane Kilkelly
0e0ccb41ff
cancel notification when accepting invite
2016-08-08 13:57:33 +01:00
Shane Kilkelly
110082390e
Test the _trySendInviteNotfification helper
2016-08-08 10:34:54 +01:00
Shane Kilkelly
9b46c1b1f7
WIP: notification when user is sent an invite
2016-08-05 16:11:03 +01:00
Shane Kilkelly
eafd61a90e
Refresh members and invites in client when status changes
2016-08-05 14:01:08 +01:00
Shane Kilkelly
8f7603c324
Add an endpoint to access project members
2016-08-04 16:47:48 +01:00
Shane Kilkelly
092c036406
Rate-limit calls to invite api
2016-08-04 09:50:47 +01:00
Shane Kilkelly
721ea88bd0
If email is already invited, resend the invite
2016-08-03 16:30:34 +01:00
Shane Kilkelly
a5ddcc3df7
Allow resending of invites
2016-08-03 15:42:19 +01:00
Shane Kilkelly
6ea690225f
Refactor view-invite to not use model calls.
2016-08-03 10:23:34 +01:00
