From e6ba25358575efedefa94442a08f9c33c104df19 Mon Sep 17 00:00:00 2001
From: Flora Thiebaut <flora.thiebaut@sdsc.ethz.ch>
Date: Tue, 23 Jul 2024 10:49:08 +0200
Subject: [PATCH] fix: use safe URL for repository icon (#3247)

Fixes #3246.
---
 .../CodeRepositories/CodeRepositoryDisplay.tsx         | 10 +++++++---
 client/src/utils/helpers/safeNewUrl.utils.ts           |  7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx b/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx
index fc9b6b5e2..146424d68 100644
--- a/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx
@@ -435,12 +435,16 @@ interface RepositoryIconProps {
 }
 
 function RepositoryIcon({ className, provider }: RepositoryIconProps) {
-  if (provider == null) {
+  const iconUrl = useMemo(
+    // eslint-disable-next-line spellcheck/spell-checker
+    () => (provider != null ? safeNewUrl("/favicon.ico", provider) : null),
+    [provider]
+  );
+
+  if (iconUrl == null) {
     return null;
   }
 
-  // eslint-disable-next-line spellcheck/spell-checker
-  const iconUrl = new URL("/favicon.ico", provider);
   return (
     <img
       className={className}
diff --git a/client/src/utils/helpers/safeNewUrl.utils.ts b/client/src/utils/helpers/safeNewUrl.utils.ts
index 99eaa8585..6e7ce6d58 100644
--- a/client/src/utils/helpers/safeNewUrl.utils.ts
+++ b/client/src/utils/helpers/safeNewUrl.utils.ts
@@ -17,12 +17,15 @@
  */
 
 /** Returns a new URL instance or null if `url` is not a valid URL string. */
-export function safeNewUrl(url: string | undefined | null): URL | null {
+export function safeNewUrl(
+  url: URL | string | undefined | null,
+  base?: URL | string | undefined
+): URL | null {
   if (url == null) {
     return null;
   }
   try {
-    return new URL(url);
+    return new URL(url, base);
   } catch (error) {
     if (error instanceof TypeError) {
       return null;