From f6c616f1e96cae32a773ab7eaea9f983500f086e Mon Sep 17 00:00:00 2001
From: runzexia <runzexia@yunify.com>
Date: Fri, 27 Sep 2019 23:50:07 +0800
Subject: [PATCH] parse 401 err, change code to 428

Signed-off-by: runzexia <runzexia@yunify.com>
---
 pkg/apiserver/devops/devops.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkg/apiserver/devops/devops.go b/pkg/apiserver/devops/devops.go
index d8eb8e34d..a4277c5e3 100644
--- a/pkg/apiserver/devops/devops.go
+++ b/pkg/apiserver/devops/devops.go
@@ -172,14 +172,20 @@ func Validate(req *restful.Request, resp *restful.Response) {
 
 	res, err := devops.Validate(scmId, req.Request)
 	if err != nil {
-		parseErr(err, resp)
+		log.Error(err)
+		if jErr, ok := err.(*devops.JkError); ok {
+			if jErr.Code != http.StatusUnauthorized {
+				resp.WriteError(jErr.Code, err)
+			} else {
+				resp.WriteHeader(http.StatusPreconditionRequired)
+			}
+		} else {
+			resp.WriteError(http.StatusInternalServerError, err)
+		}
 		return
 	}
 
 	resp.Header().Set(restful.HEADER_ContentType, restful.MIME_JSON)
-	if resp.StatusCode() == http.StatusUnauthorized {
-		resp.WriteHeader(http.StatusPreconditionRequired)
-	}
 	resp.Write(res)
 }