fix(zentao): update error message when testing connection fails (#7175) (#7176)

github-actions[bot] · d4x1 · HouLinwei · web-flow · commit 8c666a0c02a1 · 2024-03-15T12:07:09.000+08:00
Co-authored-by: Lynwee &lt;linwei.hou@merico.dev&gt;
Co-authored-by: houlinwei &lt;timeror@gmail.com&gt;
diff --git a/backend/plugins/zentao/models/access_token.go b/backend/plugins/zentao/models/access_token.go
@@ -24,4 +24,5 @@ type ApiAccessTokenRequest struct {
 
 type ApiAccessTokenResponse struct {
 	Token string `json:"token"`
+	Error string `json:"error"`
 }
diff --git a/backend/plugins/zentao/models/connection.go b/backend/plugins/zentao/models/connection.go
@@ -50,7 +50,11 @@ func (connection ZentaoConn) PrepareApiClient(apiClient plugin.ApiClient) errors
 		return errors.HttpStatus(http.StatusBadRequest).Wrap(err, "failed UnmarshalResponse for tokenResBody")
 	}
 	if tokenResBody.Token == "" {
-		return errors.HttpStatus(http.StatusBadRequest).New("failed to request access token")
+		msg := "failed to request access token"
+		if tokenResBody.Error != "" {
+			msg = tokenResBody.Error
+		}
+		return errors.HttpStatus(http.StatusBadRequest).New(msg)
 	}
 	apiClient.SetHeaders(map[string]string{
 		"Token": fmt.Sprintf("%v", tokenResBody.Token),

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,5 @@ type ApiAccessTokenRequest struct {`
`24`	`24`
`25`	`25`	`type ApiAccessTokenResponse struct {`
`26`	`26`	Token string `json:"token"`
	`27`	+ Error string `json:"error"`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,11 @@ func (connection ZentaoConn) PrepareApiClient(apiClient plugin.ApiClient) errors`
`50`	`50`	`return errors.HttpStatus(http.StatusBadRequest).Wrap(err, "failed UnmarshalResponse for tokenResBody")`
`51`	`51`	`}`
`52`	`52`	`if tokenResBody.Token == "" {`
`53`		`- return errors.HttpStatus(http.StatusBadRequest).New("failed to request access token")`
	`53`	`+ msg := "failed to request access token"`
	`54`	`+ if tokenResBody.Error != "" {`
	`55`	`+ msg = tokenResBody.Error`
	`56`	`+ }`
	`57`	`+ return errors.HttpStatus(http.StatusBadRequest).New(msg)`
`54`	`58`	`}`
`55`	`59`	`apiClient.SetHeaders(map[string]string{`
`56`	`60`	`"Token": fmt.Sprintf("%v", tokenResBody.Token),`