feat: proxy avatars for Accounts_AvatarExternalProviderUrl (#32824)

Co-authored-by: Tasso <[email protected]> Co-authored-by: Guilherme Gazzo <[email protected]>
RocketChat · Aug 21, 2024 · 1041e8c · 1041e8c
1 parent a134176
commit 1041e8c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/apps/meteor/client/providers/AvatarUrlProvider.tsx b/apps/meteor/client/providers/AvatarUrlProvider.tsx
@@ -11,13 +11,9 @@ type AvatarUrlProviderProps = {
 
 const AvatarUrlProvider = ({ children }: AvatarUrlProviderProps) => {
 	const cdnAvatarUrl = String(useSetting('CDN_PREFIX') || '');
-	const externalProviderUrl = String(useSetting('Accounts_AvatarExternalProviderUrl') || '');
 	const contextValue = useMemo(
 		() => ({
 			getUserPathAvatar: ((): ((uid: string, etag?: string) => string) => {
-				if (externalProviderUrl) {
-					return (uid: string): string => externalProviderUrl.trim().replace(/\/+$/, '').replace('{username}', uid);
-				}
 				if (cdnAvatarUrl) {
 					return (uid: string, etag?: string): string => `${cdnAvatarUrl}/avatar/${uid}${etag ? `?etag=${etag}` : ''}`;
 				}
@@ -26,7 +22,7 @@ const AvatarUrlProvider = ({ children }: AvatarUrlProviderProps) => {
 			getRoomPathAvatar: ({ type, ...room }: any): string =>
 				roomCoordinator.getRoomDirectives(type || room.t).getAvatarPath({ username: room._id, ...room }) || '',
 		}),
-		[externalProviderUrl, cdnAvatarUrl],
+		[cdnAvatarUrl],
 	);
 
 	return <AvatarUrlContext.Provider children={children} value={contextValue} />;

diff --git a/apps/meteor/server/routes/avatar/user.js b/apps/meteor/server/routes/avatar/user.js
@@ -1,4 +1,5 @@
 import { Avatars, Users } from '@rocket.chat/models';
+import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
 import { FileUpload } from '../../../app/file-upload/server';
 import { settings } from '../../../app/settings/server';
@@ -51,6 +52,13 @@ export const userAvatar = async function (req, res) {
 		return FileUpload.get(file, req, res);
 	}
 
+	if (settings.get('Accounts_AvatarExternalProviderUrl')) {
+		const response = await fetch(settings.get('Accounts_AvatarExternalProviderUrl').replace('{username}', requestUsername));
+		response.headers.forEach((value, key) => res.setHeader(key, value));
+		response.body.pipe(res);
+		return;
+	}
+
 	// if still using "letters fallback"
 	if (!wasFallbackModified(reqModifiedHeader, res)) {
 		res.writeHead(304);

diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
@@ -5530,4 +5530,4 @@
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Nachrichtenüberprüfung"
-}
+}