fix(warp): set license against Cloudflare API and surface errors inline

The license update was always failing because the Cloudflare response has
no `success` field — the check rejected every successful PUT. On real
errors (e.g. "Too many connected devices."), the toast leaked the raw URL
+ JSON body. Now the WARP API's error envelope is parsed into a clean
message and shown inline next to the Update button.
This commit is contained in:
MHSanaei
2026-05-13 21:13:16 +02:00
parent 67b098dfd3
commit adc262a238
2 changed files with 43 additions and 10 deletions
+20 -7
View File
@@ -152,13 +152,8 @@ func (s *WarpService) SetWarpLicense(license string) (string, error) {
if err := json.Unmarshal(body, &response); err != nil {
return "", err
}
if success, _ := response["success"].(bool); !success {
if errorArr, ok := response["errors"].([]any); ok && len(errorArr) > 0 {
if errorObj, ok := errorArr[0].(map[string]any); ok {
return "", common.NewError(errorObj["code"], errorObj["message"])
}
}
return "", common.NewError("warp set license failed: unknown error")
if _, ok := response["id"].(string); !ok {
return "", common.NewErrorf("warp set license failed: unexpected response: %s", string(body))
}
warpData["license_key"] = license
@@ -202,8 +197,26 @@ func doWarpRequest(req *http.Request) ([]byte, error) {
return nil, err
}
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
if msg := parseWarpError(body); msg != "" {
return nil, common.NewError(msg)
}
return nil, common.NewErrorf("warp api %s %s returned status %d: %s",
req.Method, req.URL.Path, resp.StatusCode, string(body))
}
return body, nil
}
func parseWarpError(body []byte) string {
var env struct {
Errors []struct {
Message string `json:"message"`
} `json:"errors"`
}
if err := json.Unmarshal(body, &env); err != nil {
return ""
}
if len(env.Errors) == 0 || env.Errors[0].Message == "" {
return ""
}
return env.Errors[0].Message
}