Merge pull request #622 from EdgeApp/william/fix-lobby

Fix lobby
EdgeApp · Oct 24, 2024 · dd126a1 · dd126a1
2 parents 8d5cd08 + 620ef27
commit dd126a1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/core/login/edge.ts b/src/core/login/edge.ts
@@ -78,6 +78,11 @@ export async function requestEdgeLogin(
   appId: string,
   opts: EdgeAccountOptions = {}
 ): Promise<EdgePendingEdgeLogin> {
+  function handleSoftError(error: unknown): void {
+    out.error = error
+    update(out)
+  }
+
   function handleError(error: unknown): void {
     // Stop the long-polling:
     for (const cleanup of cleanups) cleanup()
@@ -121,7 +126,7 @@ export async function requestEdgeLogin(
   const lobby = await makeLobby(ai, { loginRequest: { appId } })
   const cleanups = [
     lobby.close,
-    lobby.on('error', handleError),
+    lobby.on('error', handleSoftError),
     lobby.on('reply', reply => {
       handleReply(reply).catch(handleError)
     })

diff --git a/src/core/login/lobby.ts b/src/core/login/lobby.ts
@@ -125,7 +125,12 @@ export async function makeLobby(
   task.start({ wait: false })
 
   // Create the return object:
-  return { close: task.stop, lobbyId, on, replies }
+  return {
+    close: () => task.stop(),
+    lobbyId,
+    on,
+    replies
+  }
 }
 
 /**

diff --git a/src/core/login/login-fetch.ts b/src/core/login/login-fetch.ts
@@ -72,14 +72,14 @@ export function loginFetch(
   const { apiKey, apiSecret, serverUri } = state.login
 
   const bodyText =
-    method !== 'GET' && body != null
-      ? JSON.stringify(wasLoginRequestBody(body))
-      : ''
+    method === 'GET' || body == null
+      ? undefined
+      : JSON.stringify(wasLoginRequestBody(body))
 
   // API key:
   let authorization = `Token ${apiKey}`
   if (apiSecret != null) {
-    const requestText = `${method}\n/api${path}\n${bodyText}`
+    const requestText = `${method}\n/api${path}\n${bodyText ?? ''}`
     const hash = hmacSha256(utf8.parse(requestText), apiSecret)
     authorization = `HMAC ${apiKey} ${base64.stringify(hash)}`
   }