Fix 500 error when session properties are empty

Signed-off-by: Ashcon Partovi <ashcon@partovi.net>
Electroid · May 1, 2020 · 27867ef · 27867ef
1 parent 8d0193a
commit 27867ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/api.coffee b/src/api.coffee
@@ -36,8 +36,8 @@ export user = (id) ->
     return notFound("No user with the UUID '#{id}' was found")
   unless history
     history = [name: profile.name]
-  texturesRaw = profile.properties?.filter((item) -> item.name == "textures")[0]
-  textures = JSON.parse(atob(texturesRaw?.value || btoa("{}"))).textures
+  texturesRaw = profile.properties?.filter((item) -> item.name == "textures")[0] || {}
+  textures = JSON.parse(atob(texturesRaw?.value || btoa("{}"))).textures || {}
   unless textures.isEmpty()
     [skin, cape] = await Promise.all([
       buffer(skinUrl) if skinUrl = textures.SKIN?.url,
@@ -58,7 +58,7 @@ export user = (id) ->
       slim: textures.SKIN?.metadata?.model == "slim" || type == "alex"
       skin: {url: skinUrl, data: skin}
       cape: {url: capeUrl, data: cape} if capeUrl,
-      raw: {value: texturesRaw.value, signature: texturesRaw.signature}
+      raw: {value: texturesRaw.value, signature: texturesRaw.signature} unless texturesRaw.isEmpty()
     created_at: date
   await USERS.put(id, JSON.stringify(response), {expirationTtl: 60 * 5})
   respond(response, json: true)

diff --git a/src/index.coffee b/src/index.coffee
@@ -3,7 +3,7 @@ import { error, notFound } from "./http"
 import { uuid, user, avatar } from "./api"
 
 addEventListener("fetch", (event) ->
-  event.respondWith(route(event.request)))
+  event.respondWith(routeDebug(event.request)))
 
 routeDebug = (request) ->
   try