Merge pull request #6082 from mozilla/local-image-fix

Use non-canonical URL for local non-model assets
Hubs-Foundation · Jun 27, 2023 · e7d85ec · e7d85ec
2 parents 4e19e51 + 5bcff45
commit e7d85ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/utils/media-url-utils.js b/src/utils/media-url-utils.js
@@ -71,7 +71,7 @@ export const scaledThumbnailUrlFor = (url, width, height) => {
 };
 
 export const isNonCorsProxyDomain = hostname => {
-  return nonCorsProxyDomains.find(domain => hostname.endsWith(domain));
+  return !!nonCorsProxyDomains.find(domain => hostname.endsWith(domain));
 };
 
 export const proxiedUrlFor = url => {

diff --git a/src/utils/media-utils.js b/src/utils/media-utils.js
@@ -615,10 +615,9 @@ export async function resolveMediaInfo(urlString) {
 
   // We want to resolve and proxy some hubs urls, like rooms and scene links,
   // but want to avoid proxying assets in order for this to work in dev environments
-  const isLocalModelAsset =
-    isNonCorsProxyDomain(url.hostname) && (guessContentType(url.href) || "").startsWith("model/gltf");
+  const isLocalAsset = isNonCorsProxyDomain(url.hostname);
 
-  if (url.protocol != "data:" && url.protocol != "hubs:" && !isLocalModelAsset) {
+  if (url.protocol != "data:" && url.protocol != "hubs:" && !isLocalAsset) {
     const response = await resolveUrl(url.href);
     canonicalUrl = response.origin;
     if (canonicalUrl.startsWith("//")) {