Skip to content

Conversation

@pierre-lehnen-rc
Copy link
Contributor

@pierre-lehnen-rc pierre-lehnen-rc commented Jan 9, 2020

  • Change Invite Cloud URL to use the /invite route
  • Change the useInviteLink method to also return the room prid
  • Join the room only after assigning an username to the registered user
  • Fixed permission checks (missing scope)

closes #16242 (comment)

// If the user already has an username, then join the invite room,
// If no username is set yet, then the the join will happen on the setUsername method
if (user.username) {
addUserToRoom(room._id, user);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only need to save the token in the user (or add a list of rooms to join as my previous suggestion) on else here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We thought this could be useful information for statistics at some point, so I'm storing the token to every registered user.

@lgtm-com
Copy link

lgtm-com bot commented Jan 14, 2020

This pull request introduces 1 alert when merging 6d78012 into b577095 - view on LGTM.com

new alerts:

  • 1 for Unused variable, import, function or class

@sampaiodiego sampaiodiego modified the milestones: 2.4.2, 2.4.3 Jan 28, 2020
@sampaiodiego sampaiodiego changed the title [NEW] Invite links improvements [FIX] Invite links usage by channel owners/moderators Jan 28, 2020
@sampaiodiego sampaiodiego merged commit 7559c05 into develop Jan 28, 2020
@sampaiodiego sampaiodiego deleted the invite-links-improvements branch January 28, 2020 18:02
@sampaiodiego sampaiodiego mentioned this pull request Jan 28, 2020
ggazzo added a commit that referenced this pull request Jan 29, 2020
…-system-messages

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Role tags missing - Description field explanation (#16356)
  Regression: Rate limiter was not working due to Meteor internal changes (#16361)
  [FIX] Invite links usage by channel owners/moderators (#16176)
  Fix assets download on CI (#16352)
  Regression: Fix set name to alias validation (#16347)
  Send build artifacts to S3 (#16237)
  [NEW] Create a user for the Apps during installation (#15896)
  Add missing translations (#16150)
  fix slack cvs user importer (#16253)
  [FIX] The "click to load" text is hard-coded and not translated. (#16142)
  [FIX] Integrations list without pagination and outgoing integration creation (#16233)
ggazzo added a commit that referenced this pull request Jan 29, 2020
…-presence-lazy

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Role tags missing - Description field explanation (#16356)
  Regression: Rate limiter was not working due to Meteor internal changes (#16361)
  [FIX] Invite links usage by channel owners/moderators (#16176)
  Fix assets download on CI (#16352)
  Regression: Fix set name to alias validation (#16347)
  Send build artifacts to S3 (#16237)
  [NEW] Create a user for the Apps during installation (#15896)
ggazzo added a commit that referenced this pull request Jan 30, 2020
…it.2.0-turbo

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [BREAK] Hide system messages (#16243)
  [IMPROVE] Prevent "App user" from being deleted by the admin (#16373)
  [FIX] Adding 'lang' tag (#16375)
  Lint: Resolve complexity warnings (#16114)
  Fix Preview Docker image (#16379)
  [BREAK] Upgrade to Meteor 1.9 and NodeJS 12 (#16252)
  [FIX] App removal was moving logs to the trash collection (#16362)
  [FIX] Role tags missing - Description field explanation (#16356)
  Regression: Rate limiter was not working due to Meteor internal changes (#16361)
  [FIX] Invite links usage by channel owners/moderators (#16176)
  Fix assets download on CI (#16352)
  Regression: Fix set name to alias validation (#16347)
  Send build artifacts to S3 (#16237)
  [NEW] Create a user for the Apps during installation (#15896)
  Add missing translations (#16150)
  fix slack cvs user importer (#16253)
  [FIX] The "click to load" text is hard-coded and not translated. (#16142)
gabriellsh added a commit that referenced this pull request Jan 31, 2020
…email-validation-message

* 'develop' of github.com:RocketChat/Rocket.Chat: (22 commits)
  [IMPROVE] Update katex version  (#16393)
  [FIX] Mail Msg Cancel button not closing the flexbar (#16263)
  [FIX] Highlight freezing the UI (#16378)
  [BREAK] Hide system messages (#16243)
  [IMPROVE] Prevent "App user" from being deleted by the admin (#16373)
  [FIX] Adding 'lang' tag (#16375)
  Lint: Resolve complexity warnings (#16114)
  Fix Preview Docker image (#16379)
  [BREAK] Upgrade to Meteor 1.9 and NodeJS 12 (#16252)
  [FIX] App removal was moving logs to the trash collection (#16362)
  [FIX] Role tags missing - Description field explanation (#16356)
  Regression: Rate limiter was not working due to Meteor internal changes (#16361)
  [FIX] Invite links usage by channel owners/moderators (#16176)
  Fix assets download on CI (#16352)
  Regression: Fix set name to alias validation (#16347)
  Send build artifacts to S3 (#16237)
  [NEW] Create a user for the Apps during installation (#15896)
  Add missing translations (#16150)
  fix slack cvs user importer (#16253)
  [FIX] The "click to load" text is hard-coded and not translated. (#16142)
  ...
gabriellsh added a commit that referenced this pull request Jan 31, 2020
…pinned_messages_collapse

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [IMPROVE] Update katex version  (#16393)
  [FIX] Mail Msg Cancel button not closing the flexbar (#16263)
  [FIX] Highlight freezing the UI (#16378)
  [BREAK] Hide system messages (#16243)
  [IMPROVE] Prevent "App user" from being deleted by the admin (#16373)
  [FIX] Adding 'lang' tag (#16375)
  Lint: Resolve complexity warnings (#16114)
  Fix Preview Docker image (#16379)
  [BREAK] Upgrade to Meteor 1.9 and NodeJS 12 (#16252)
  [FIX] App removal was moving logs to the trash collection (#16362)
  [FIX] Role tags missing - Description field explanation (#16356)
  Regression: Rate limiter was not working due to Meteor internal changes (#16361)
  [FIX] Invite links usage by channel owners/moderators (#16176)
  Fix assets download on CI (#16352)
  Regression: Fix set name to alias validation (#16347)
  Send build artifacts to S3 (#16237)
  [NEW] Create a user for the Apps during installation (#15896)
  Add missing translations (#16150)
  fix slack cvs user importer (#16253)
ggazzo added a commit that referenced this pull request Feb 3, 2020
…nto system-messages

* 'system-messages' of github.com:RocketChat/Rocket.Chat:
  [BREAK] Hide system messages (#16243)
  [IMPROVE] Prevent "App user" from being deleted by the admin (#16373)
  [FIX] Adding 'lang' tag (#16375)
  Lint: Resolve complexity warnings (#16114)
  Fix Preview Docker image (#16379)
  [BREAK] Upgrade to Meteor 1.9 and NodeJS 12 (#16252)
  [FIX] App removal was moving logs to the trash collection (#16362)
  [FIX] Role tags missing - Description field explanation (#16356)
  Regression: Rate limiter was not working due to Meteor internal changes (#16361)
  [FIX] Invite links usage by channel owners/moderators (#16176)
  Fix assets download on CI (#16352)
igit-cn added a commit to igit-cn/Rocket.Chat that referenced this pull request Mar 20, 2020
Invite links usage by channel owners/moderators (RocketChat#16176)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2.4.0 : Create invite link not working as channel owner

5 participants