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

fix: Removed agent access to already taken rooms #28979

Merged
merged 6 commits into from
Jun 5, 2023

Conversation

aleksandernsilva
Copy link
Contributor

@aleksandernsilva aleksandernsilva commented Apr 19, 2023

Proposed changes (including videos or screenshots)

This PR fixes an issue where an agent can see another agent's conversation with "manual" routing method.

Issue(s)

OC-680
OC-873

Steps to test or reproduce

Further comments

@codecov
Copy link

codecov bot commented Apr 19, 2023

Codecov Report

Merging #28979 (994271f) into develop (2945294) will increase coverage by 0.78%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #28979      +/-   ##
===========================================
+ Coverage    45.98%   46.76%   +0.78%     
===========================================
  Files          685      698      +13     
  Lines        12988    13076      +88     
  Branches      2209     2227      +18     
===========================================
+ Hits          5972     6115     +143     
+ Misses        6705     6645      -60     
- Partials       311      316       +5     
Flag Coverage Δ
e2e 46.74% <0.00%> (+0.79%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@aleksandernsilva aleksandernsilva marked this pull request as ready for review April 19, 2023 20:13
@aleksandernsilva aleksandernsilva requested review from a team as code owners April 19, 2023 20:13
tassoevan
tassoevan previously approved these changes Apr 20, 2023
KevLehman
KevLehman previously approved these changes Apr 20, 2023
@KevLehman
Copy link
Contributor

KevLehman commented Apr 20, 2023

Should this go to develop? Or should go to 6.2 branch?

Forget it, got my answer 😬

@aleksandernsilva aleksandernsilva dismissed stale reviews from KevLehman and tassoevan via e1862ca May 8, 2023 12:36
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: conflict labels May 8, 2023
MartinSchoeler
MartinSchoeler previously approved these changes May 8, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels May 9, 2023
Copy link
Member

@ggazzo ggazzo left a comment

Choose a reason for hiding this comment

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

I don't think it's a good solution. the extremely specific code, happening inside a generic provider doing something that is considered at least "weird". Is the only solution in the frontend? Is there nothing the backend can do to prohibit this operation?

@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label May 16, 2023
@kodiakhq
Copy link
Contributor

kodiakhq bot commented May 16, 2023

This PR currently has a merge conflict. Please resolve this and then re-add the ['stat: ready to merge', 'automerge'] label.

@KevLehman KevLehman closed this May 25, 2023
@aleksandernsilva aleksandernsilva removed this from the 6.3.0 milestone May 25, 2023
@changeset-bot
Copy link

changeset-bot bot commented Jun 5, 2023

🦋 Changeset detected

Latest commit: 994271f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 24 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/api-client Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 5, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 5, 2023
@ggazzo ggazzo merged commit 8fcb3ed into develop Jun 5, 2023
@ggazzo ggazzo deleted the fix/join-visible-for-agents branch June 5, 2023 18:15
aleksandernsilva added a commit that referenced this pull request Jun 6, 2023
Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>
gabriellsh added a commit that referenced this pull request Jun 6, 2023
…importer-messages-not-shown

* 'develop' of github.com:RocketChat/Rocket.Chat:
  fix: Room history scroll position (#29335)
  fix: check for $addToSet to be not empty before passing update params (#29378)
  chore: update `badge-level-0` color (#29460)
  fix: Saving Business hour throws an alert (#29449)
  regression: emojiPicker position (#29408)
  chore: Update codeowners to add ownership of rest typings package to backend (#29437)
  fix: Removed agent access to already taken rooms (#28979)
  fix: `queuedForUser` endpoint not filtering by status (#29189)
  regression: Marketplace Selectors (#29443)
  chore: fix contextualbar size (#29441)
  chore: `ComposerBoxPopup` Items alignment (#29320)
  feat: add support for `MONOLITH_TRANSPORTER` env var (#29373)
  fix: Import progress page stuck at 0% (#29421)
  feat: access-marketplace permission (#29203)
  chore(ddp-client): freeze data emitted by the sdk (#29430)
  refactor: `Table` on Integrations Page (#29428)
  regression: Update `LoadingIndicator` colors (#29424)
  chore(meteor): Update mention style (#29426)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants