Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMPROVE] Prevent "App user" from being deleted by the admin #16373

Merged

Conversation

shiqimei
Copy link
Contributor

Prevent deleting an app user from the admin - users panel unexpectedly, which can make sure the app user is removed only through the corresponding app uninstallation.

Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

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

Please start error codes with error- =)

server/methods/deleteUser.js Outdated Show resolved Hide resolved
packages/rocketchat-i18n/i18n/zh.i18n.json Outdated Show resolved Hide resolved
packages/rocketchat-i18n/i18n/en.i18n.json Outdated Show resolved Hide resolved
Shiqi Mei and others added 3 commits January 30, 2020 22:53
Co-Authored-By: Diego Sampaio <chinello@gmail.com>
Co-Authored-By: Diego Sampaio <chinello@gmail.com>
Co-Authored-By: Diego Sampaio <chinello@gmail.com>
@shiqimei
Copy link
Contributor Author

@sampaiodiego Thanks!

@sampaiodiego sampaiodiego merged commit 060bf9f into develop Jan 30, 2020
@sampaiodiego sampaiodiego deleted the app-user.prevent-app-users-from-being-deleted-by-admin branch January 30, 2020 15:49
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 Jan 31, 2020
* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Container heights (#16388)
  Regression: App deletion wasn’t returning the correct information (#16360)
  [BREAK] Remove deprecated publications (#16351)
  [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)
gabriellsh added a commit that referenced this pull request Feb 3, 2020
…default-favorite-channels

* 'develop' of github.com:RocketChat/Rocket.Chat: (46 commits)
  Regression: Fix status bar margins (#16438)
  [NEW] Check the Omnichannel service status per Department (#16425)
  [IMPROVE] Show more information related to the Omnichannel room closing data (#16414)
  Fix index creation for apps_logs collection (#16401)
  Revert message properties validation (#16395)
  [FIX] Rooms not being marked as read sometimes (#16397)
  Update apps engine to 1.12.0-beta.2496 (#16398)
  [FIX] Container heights (#16388)
  Regression: App deletion wasn’t returning the correct information (#16360)
  [BREAK] Remove deprecated publications (#16351)
  [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)
  ...
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)
@sampaiodiego sampaiodiego mentioned this pull request Feb 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants