fix downloading password protected maps

Author: k2d222

client/src/ui/actions.ts

@@ -19,8 +19,19 @@ export async function saveMap() {
 export async function downloadMap() {
   const rmap_ = get(rmap)
   const server_ = get(server)
-  const httpUrl = server_.httpUrl
-  download(`${httpUrl}/maps/${rmap_.map.name}`, `${rmap_.map.name}.map`)
+  const name = rmap_.map.name
+
+  const id = showInfo(`Downloading '${name}'…`, 'none')
+  try {
+    const resp = await server_.fetch('maps/' + name)
+    const data = await resp.blob()
+    download(data, name + '.map')
+    showInfo(`Downloaded '${name}'.`)
+  } catch (e) {
+    showError(`Failed to download ${name}: ${e}`)
+  } finally {
+    clearDialog(id)
+  }
 }
 
 export async function deleteMap() {

client/src/ui/lib/util.ts

@@ -16,32 +16,22 @@ import type { WebSocketServer } from '../../server/server'
 import type { Config, MapCreation, MapDetail } from '../../server/protocol'
 import * as MapDir from '../../twmap/mapdir'
 import { QuadsLayer } from '../../twmap/quadsLayer'
-import { clearDialog, showInfo } from './dialog'
 
 export type Ctor<T> = new (...args: any[]) => T
 
 export type FormEvent<T> = Event & { currentTarget: EventTarget & T }
 export type FormInputEvent = FormEvent<HTMLInputElement>
 
-export async function download(path: string, name: string) {
-  const id = showInfo(`Downloading '${name}'…`, 'none')
-  try {
-    const resp = await fetch(path)
-    if (!resp.ok) throw await resp.text()
-    const data = await resp.blob()
+export function download(data: Blob, name: string) {
     const url = URL.createObjectURL(data)
 
     const link = document.createElement('a')
     link.href = url
-    link.download = name
+    link.download = name + '.map'
 
     document.body.append(link)
     link.click()
     link.remove()
-    showInfo(`Downloaded '${name}'.`)
-  } finally {
-    clearDialog(id)
-  }
 }
 
 export async function uploadMap(url: string, name: string, file: Blob, config: Partial<Config>) {

client/src/ui/routes/lobby.svelte

@@ -220,8 +220,19 @@
     alert('TODO renaming maps is not yet implemented.')
   }
 
-  function onDownloadMap(name: string) {
-    download(`${httpUrl}/maps/${name}`, `${name}.map`)
+  async function onDownloadMap(name: string) {
+    const id = showInfo(`Downloading '${name}'…`, 'none')
+    try {
+      const resp = await fetch(`${httpUrl}/maps/${name}`)
+      if (!resp.ok) throw await resp.text()
+      const data = await resp.blob()
+      download(data, name + '.map')
+      showInfo(`Downloaded '${name}'.`)
+    } catch (e) {
+      showError(`Failed to download ${name}: ${e}`)
+    } finally {
+      clearDialog(id)
+    }
   }
 
   function onAddServer() {