fix(electron-updater): url parameters, search is inside

Author: Erim32

packages/electron-updater/src/main.ts

@@ -157,14 +157,13 @@ export function newBaseUrl(url: string) {
 // so, it makes sense only for Generic Provider for channel files
 export function newUrlFromBase(pathname: string, baseUrl: URL, addRandomQueryToAvoidCaching: boolean = false): URL {
   const result = new URL(pathname, baseUrl)
-  let hasSearch = result.search != null && result.search.length !== 0
   // search is not propagated (search is an empty string if not specified)
-  if (!hasSearch && baseUrl.search) {
-    result.search = baseUrl.search
-    hasSearch = true
+  const search = baseUrl.search
+  if (search != null && search.length !== 0) {
+    result.search = search
   }
-  if (addRandomQueryToAvoidCaching && !hasSearch) {
+  else if (addRandomQueryToAvoidCaching) {
     result.search = `noCache=${Date.now().toString(32)}`
   }
   return result
-}
+}

packages/electron-updater/src/providers/PrivateGitHubProvider.ts

@@ -62,14 +62,14 @@ export class PrivateGitHubProvider extends BaseGitHubProvider<PrivateGitHubUpdat
   }
 
   private async getLatestVersionInfo(cancellationToken: CancellationToken): Promise<ReleaseInfo> {
-    let baseUrl = this.basePath
+    let basePath = this.basePath
     const allowPrerelease = this.updater.allowPrerelease
 
     if (!allowPrerelease) {
-      baseUrl = `${baseUrl}/latest`
+      basePath = `${basePath}/latest`
     }
 
-    const url = newUrlFromBase(`${baseUrl}`, this.baseUrl)
+    const url = newUrlFromBase(basePath, this.baseUrl)
     try {
       let version = (JSON.parse((await this.httpRequest(url, this.configureHeaders("application/vnd.github.v3+json"), cancellationToken))!!))
       if (allowPrerelease) {