fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` #33296

tassoevan · 2024-09-16T15:58:05Z

Proposed changes (including videos or screenshots)

It removes remaining direct references to external user avatar URLs, mainly correcting the behavior of E2E encryption messages and desktop notifications.

Also fixed the priority for external provider URL. Before #32824 all avatars fetches when the external url was configured would point directly to the external URL. With the changes made in the aforementioned PR we started proxying those request through Rocket.Chat's server, but the local (uploaded by the user to rocket.chat directly) avatars were having priority over the external provider.

Issue(s)

#32824 (comment)

Steps to test or reproduce

Further comments

It needs to be applied to 6.12.x too.

CORE-692

changeset-bot · 2024-09-16T15:58:10Z

🦋 Changeset detected

Latest commit: 7261aaf

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

This PR includes changesets to release 28 packages

Name	Type
@rocket.chat/meteor	Patch
@rocket.chat/core-typings	Patch
@rocket.chat/rest-typings	Patch
@rocket.chat/api-client	Patch
@rocket.chat/apps	Patch
@rocket.chat/core-services	Patch
@rocket.chat/cron	Patch
@rocket.chat/ddp-client	Patch
@rocket.chat/fuselage-ui-kit	Patch
@rocket.chat/gazzodown	Patch
@rocket.chat/livechat	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/license	Patch
@rocket.chat/omnichannel-services	Patch
@rocket.chat/pdf-worker	Patch
@rocket.chat/presence	Patch
rocketchat-services	Patch
@rocket.chat/uikit-playground	Patch
@rocket.chat/models	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 · 2024-09-16T15:58:11Z

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

github-actions · 2024-09-16T16:00:17Z

PR Preview Action v1.4.8
Preview removed because the pull request was closed.
2024-09-18 14:29 UTC

codecov · 2024-09-16T16:03:23Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.84%. Comparing base (9a38c8e) to head (7261aaf).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop   #33296   +/-   ##
========================================
  Coverage    59.84%   59.84%           
========================================
  Files         2554     2554           
  Lines        63020    63014    -6     
  Branches     14133    14129    -4     
========================================
- Hits         37713    37711    -2     
+ Misses       22900    22896    -4     
  Partials      2407     2407

Flag	Coverage Δ
unit	`77.14% <ø> (ø)`

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

…client

scuciatto · 2024-09-18T15:29:36Z

/patch

…ve remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <[email protected]>

dionisio-bot · 2024-09-18T15:30:20Z

Pull request #33314 added to Project: "Patch 6.12.2"

…ve remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <[email protected]>

…hAvatarById * 'develop' of github.com:RocketChat/Rocket.Chat: feat: Implement proper accessbility for report user modal (#33294) chore: update E2EE setting text (#33226) fix: conference calls are shown as "not answered" after they end (#33179) fix: markdown inconsistency with bold and italics (#33157) feat: E2EE messages mentions (#32510) refactor: Reactions set/unset (#32994) ci: auto candidate releases (#33325) feat: `RoomSidepanel` (#33225) feat: contextualbar based on chat size (#33321) fix: error on sendmessage stub (#33317) fix: `LivechatSessionTaken` webhook event called without `agent` param (#33209) refactor: Remove old `setreaction` callbacks and use new after/before callbacks (#33309) fix: Mark as unread not working (#32939) fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) feat: Allow managing association to business units on departments' creation and update (#32682)

* Bump 6.12.1 * fix: message parser being slow to process very long messages with too many symbols (#33254) Co-authored-by: Pierre Lehnen <[email protected]> * fix: Allow to use the token from `room.v` when requesting transcript instead of finding visitor (#33242) Co-authored-by: Kevin Aleman <[email protected]> * fix: Retention Policy cached settings not updated during upgrade procedure (#33265) Co-authored-by: gabriellsh <[email protected]> * fix: imported fixes (#33268) Co-authored-by: Julio A. <[email protected]> * Release 6.12.1 [no ci] * fix: Federation callback not awaiting model call (#33298) * fix: correct parameter order in afterSaveMessage to restore outgoing webhooks and related features (#33295) * feat: New endpoint for listing rooms & discussions from teams (#33177) * chore: Update typings on callbacks to accept less than a full room object (#33305) * fix: resolve avatar download issue on setUsername by refining service selection logic (#33193) * feat: Allow managing association to business units on departments' creation and update (#32682) * fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <[email protected]> * fix: Mark as unread not working (#32939) Co-authored-by: Douglas Fabris <[email protected]> * refactor: Remove old `setreaction` callbacks and use new after/before callbacks (#33309) * fix: `LivechatSessionTaken` webhook event called without `agent` param (#33209) * fix: error on sendmessage stub (#33317) * feat: contextualbar based on chat size (#33321) * feat: `RoomSidepanel` (#33225) Co-authored-by: Guilherme Gazzo <[email protected]> * ci: auto candidate releases (#33325) Co-authored-by: Diego Sampaio <[email protected]> * refactor: Reactions set/unset (#32994) * feat: E2EE messages mentions (#32510) * fix: markdown inconsistency with bold and italics (#33157) * fix: conference calls are shown as "not answered" after they end (#33179) * Release 6.13.0-rc.0 * chore: update E2EE setting text (#33226) * feat: Implement proper accessbility for report user modal (#33294) Co-authored-by: Tasso Evangelista <[email protected]> * fix: imported fixes (#33330) * chore: create network broker package (#33338) * feat: Adds new admin feature preview setting management (#33212) Co-authored-by: Guilherme Gazzo <[email protected]> * chore: move common files to core-services (#33341) * regression: `Sidepanel` color highlight (#33342) * feat: Adds new admin feature preview setting management (#33212) Co-authored-by: Guilherme Gazzo <[email protected]> * fix: Avoid destructuring `connectionData` when value is undefined (#33339) * Release 6.13.0-rc.1 [no ci] * chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356) * Bump rocket.chat to 6.14.0-develop (#33366) * ci: use node20 for release action (#33343) --------- Co-authored-by: rocketchat-github-ci <[email protected]> Co-authored-by: dionisio-bot[bot] <117394943+dionisio-bot[bot]@users.noreply.github.com> Co-authored-by: Pierre Lehnen <[email protected]> Co-authored-by: Kevin Aleman <[email protected]> Co-authored-by: gabriellsh <[email protected]> Co-authored-by: Julio A. <[email protected]> Co-authored-by: Guilherme Gazzo <[email protected]> Co-authored-by: Kevin Aleman <[email protected]> Co-authored-by: Ricardo Garim <[email protected]> Co-authored-by: Matheus Barbosa Silva <[email protected]> Co-authored-by: Tasso Evangelista <[email protected]> Co-authored-by: Martin Schoeler <[email protected]> Co-authored-by: Douglas Fabris <[email protected]> Co-authored-by: Júlia Jaeger Foresti <[email protected]> Co-authored-by: Guilherme Gazzo <[email protected]> Co-authored-by: Diego Sampaio <[email protected]> Co-authored-by: Hugo Costa <[email protected]> Co-authored-by: csuadev <[email protected]> Co-authored-by: Henrique Guimarães Ribeiro <[email protected]> Co-authored-by: Tasso Evangelista <[email protected]> Co-authored-by: Lucas Pelegrino <[email protected]> Co-authored-by: Trivikram Kamat <[email protected]>

…ve remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <[email protected]>

tassoevan requested a review from a team September 16, 2024 15:58

tassoevan added this to the 6.13 milestone Sep 16, 2024

tassoevan marked this pull request as ready for review September 16, 2024 17:01

tassoevan marked this pull request as draft September 16, 2024 17:54

tassoevan added 2 commits September 16, 2024 15:53

Remove remnant references of Accounts_AvatarExternalProviderUrl on …

f8dd991

…client

Remove redundant CDN handling

817bc7e

tassoevan force-pushed the fix/external-avatars branch from b6bfbec to 817bc7e Compare September 16, 2024 18:53

gabriellsh and others added 2 commits September 16, 2024 18:31

fix: Avatar external provider URL wrong priority

b23ec89

Update CS

bf13e15

gabriellsh changed the title ~~fix: Remove remnant references of Accounts_AvatarExternalProviderUrl on client~~ fix: Local avatars prioritized over external avatar provider and remove remnant references on client of Accounts_AvatarExternalProviderUrl Sep 16, 2024

tassoevan marked this pull request as ready for review September 16, 2024 23:46

tassoevan requested a review from a team as a code owner September 16, 2024 23:46

MarcosSpessatto approved these changes Sep 17, 2024

View reviewed changes

MartinSchoeler approved these changes Sep 17, 2024

View reviewed changes

tassoevan added the stat: QA assured Means it has been tested and approved by a company insider label Sep 17, 2024

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Sep 17, 2024

kodiakhq bot added 2 commits September 17, 2024 21:54

Merge branch 'develop' into fix/external-avatars

42c43e0

Merge branch 'develop' into fix/external-avatars

7261aaf

kodiakhq bot merged commit fdde637 into develop Sep 18, 2024
50 checks passed

kodiakhq bot deleted the fix/external-avatars branch September 18, 2024 14:29

dionisio-bot bot pushed a commit that referenced this pull request Sep 18, 2024

fix: Local avatars prioritized over external avatar provider and remo…

5cdb1f5

…ve remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <[email protected]>

dionisio-bot bot mentioned this pull request Sep 18, 2024

fix: Local avatars prioritized over external avatar provider and remove remnant references on client of Accounts_AvatarExternalProviderUrl #33314

Merged

rocketchat-github-ci mentioned this pull request Sep 20, 2024

Release 6.13.0 #33326

Merged

KevLehman pushed a commit that referenced this pull request Sep 20, 2024

fix: Local avatars prioritized over external avatar provider and remo…

da060b1

…ve remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <[email protected]>

abhinavkrin pushed a commit that referenced this pull request Oct 25, 2024

fix: Local avatars prioritized over external avatar provider and remo…

b51d8c4

…ve remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` #33296

fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` #33296

tassoevan commented Sep 16, 2024 •

edited by jira bot

Loading

changeset-bot bot commented Sep 16, 2024 •

edited

Loading

dionisio-bot bot commented Sep 16, 2024 •

edited

Loading

github-actions bot commented Sep 16, 2024 •

edited

Loading

codecov bot commented Sep 16, 2024 •

edited

Loading

scuciatto commented Sep 18, 2024

dionisio-bot bot commented Sep 18, 2024

fix: Local avatars prioritized over external avatar provider and remove remnant references on client of Accounts_AvatarExternalProviderUrl #33296

fix: Local avatars prioritized over external avatar provider and remove remnant references on client of Accounts_AvatarExternalProviderUrl #33296

Conversation

tassoevan commented Sep 16, 2024 • edited by jira bot Loading

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

changeset-bot bot commented Sep 16, 2024 • edited Loading

🦋 Changeset detected

dionisio-bot bot commented Sep 16, 2024 • edited Loading

github-actions bot commented Sep 16, 2024 • edited Loading

codecov bot commented Sep 16, 2024 • edited Loading

Codecov Report

scuciatto commented Sep 18, 2024

dionisio-bot bot commented Sep 18, 2024

fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` #33296

fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` #33296

tassoevan commented Sep 16, 2024 •

edited by jira bot

Loading

changeset-bot bot commented Sep 16, 2024 •

edited

Loading

dionisio-bot bot commented Sep 16, 2024 •

edited

Loading

github-actions bot commented Sep 16, 2024 •

edited

Loading

codecov bot commented Sep 16, 2024 •

edited

Loading