Changed UrlUtils to replace protocol to be in line with the one specified in the CDN

Author: ebkr

src/providers/generic/connection/CdnProvider.ts

@@ -58,7 +58,7 @@ export default class CdnProvider {
 
     public static replaceCdnHost(url: string) {
         return CdnProvider.preferredCdn
-            ? replaceHost(url, CdnProvider.preferredCdn.host)
+            ? replaceHost(url, CdnProvider.preferredCdn)
             : url;
     }
 

src/utils/UrlUtils.ts

@@ -1,3 +1,5 @@
+import { CdnDefinition } from 'src/providers/cdn/CdnHostList';
+
 /**
  * Append given search parameters to an URL which may or may not already
  * have search parameters.
@@ -21,13 +23,14 @@ export const addOrReplaceSearchParams = (url: string, paramString: string) => {
  * Replace URL host, i.e. the domain and the port number.
  *
  * @param url e.g. "https://thunderstore.io/foo"
- * @param domainAndPort e.g. "thunderstore.dev" or "thunderstore.dev:8080"
+ * @param cdn The preferred cdn definition
  * @returns e.g. "https://thunderstore.dev:8080/foo"
  */
-export const replaceHost = (url: string, domainAndPort: string) => {
-    const newValues = domainAndPort.split(":");
+export const replaceHost = (url: string, cdn: CdnDefinition) => {
+    const newValues = cdn.host.split(":");
     const newUrl = new URL(url);
-    newUrl.hostname = newValues[0];
+    newUrl.hostname = newValues[0]!;
     newUrl.port = newValues[1] || "";
+    newUrl.protocol = cdn.protocol;
     return newUrl.href;
 };