diff --git a/VERSION.properties b/VERSION.properties index f5027dbe..7fefe937 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.20.48 +client.version=1.20.49 server.version=1.16.25 diff --git a/shine-UI/js/services/key-rotation-service.js b/shine-UI/js/services/key-rotation-service.js index 71057adf..bdd36923 100644 --- a/shine-UI/js/services/key-rotation-service.js +++ b/shine-UI/js/services/key-rotation-service.js @@ -12,9 +12,11 @@ function payload(resp) { return resp?.payload && typeof resp.payload === 'object function assertOk(resp, op) { if (Number(resp?.status) >= 200 && Number(resp?.status) < 300) return payload(resp); const p = payload(resp); - const message = p?.message || p?.error || p?.code || `${op} failed (${resp?.status ?? '?'})`; + const responseCode = resp?.code || resp?.error || resp?.errorCode || ''; + const responseMessage = resp?.message || ''; + const message = p?.message || p?.error || p?.code || responseMessage || responseCode || `${op} failed (${resp?.status ?? '?'})`; const error = new Error(String(message)); - error.code = p?.code || p?.errorCode || ''; + error.code = p?.code || p?.errorCode || responseCode; error.response = resp; throw error; }