\n
", "success": "🌞"}
+ assert.Equal(t, messages, flashMessageDecode(flashMessageEncode(messages, 100)))
+ assert.Equal(t, map[string]string{"error": "删除分支失败"}, flashMessageDecode(flashMessageEncode(map[string]string{"error": "删除分支\xff失败"}, 100)))
+
+ const limit = 99
+ encoded := flashMessageEncode(map[string]string{"error": strings.Repeat("x", 200)}, limit)
+ assert.Len(t, encoded, limit/3*4)
+ decoded := flashMessageDecode(encoded)
+ assert.Equal(t, map[string]string{"error": strings.Repeat("x", limit-len("error="))}, decoded)
+
+ // also support legacy format
+ decoded = flashMessageDecode("error=invalid%20message")
+ assert.Equal(t, map[string]string{"error": "invalid message"}, decoded)
+}
diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index 6ce7975fd9b..5711d494e64 100644
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -1405,12 +1405,8 @@ func Run(ctx *context_module.Context) {
return nil
})
if err != nil {
- if errTr := util.ErrorAsTranslatable(err); errTr != nil {
- ctx.Flash.Error(errTr.Translate(ctx.Locale))
- ctx.Redirect(redirectURL)
- } else {
- ctx.ServerError("DispatchActionWorkflow", err)
- }
+ ctx.FlashErrorAuto(err)
+ ctx.Redirect(redirectURL)
return
}
diff --git a/routers/web/repo/editor_error.go b/routers/web/repo/editor_error.go
index 902f3e3c441..3b4f7ab04ab 100644
--- a/routers/web/repo/editor_error.go
+++ b/routers/web/repo/editor_error.go
@@ -38,8 +38,8 @@ func editorHandleFileOperationErrorRender(ctx *context_service.Context, message,
}
func editorHandleFileOperationError(ctx *context_service.Context, targetBranchName string, err error) {
- if errAs := util.ErrorAsTranslatable(err); errAs != nil {
- ctx.JSONError(errAs.Translate(ctx.Locale))
+ if htmlMsg, ok := util.ErrorTranslateHTML(err, ctx.Locale); ok {
+ ctx.JSONError(htmlMsg)
} else if errAs, ok := errorAs[git.ErrNotExist](err); ok {
ctx.JSONError(ctx.Tr("repo.editor.file_modifying_no_longer_exists", errAs.RelPath))
} else if errAs, ok := errorAs[git_model.ErrLFSFileLocked](err); ok {
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 3d060dbefe9..75177fa81f4 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1266,9 +1266,6 @@ func MergePullRequest(ctx *context.Context) {
if deleteBranchAfterMerge {
deleteBranchAfterMergeAndFlashMessage(ctx, pr.ID)
- if ctx.Written() {
- return
- }
}
ctx.JSONRedirect(issue.Link())
}
@@ -1279,16 +1276,11 @@ func deleteBranchAfterMergeAndFlashMessage(ctx *context.Context, prID int64) {
if errors.Is(err, util.ErrPermissionDenied) || errors.Is(err, util.ErrNotExist) {
// no need to show error to end users if no permission or branch not exist
log.Debug("DeleteBranchAfterMerge (ignore unnecessary error): %v", err)
- return
- } else if errTr := util.ErrorAsTranslatable(err); errTr != nil {
- ctx.Flash.Error(errTr.Translate(ctx.Locale))
- return
- } else if err == nil {
+ } else if err != nil {
+ ctx.FlashErrorAuto(err)
+ } else {
ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName))
- return
}
- // catch unknown errors
- ctx.ServerError("DeleteBranchAfterMerge", err)
}
// CancelAutoMergePullRequest cancels a scheduled pr
@@ -1479,9 +1471,6 @@ func CleanUpPullRequest(ctx *context.Context) {
return
}
deleteBranchAfterMergeAndFlashMessage(ctx, issue.PullRequest.ID)
- if ctx.Written() {
- return
- }
ctx.JSONRedirect(issue.Link())
}
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index 8e5a812c239..b0d842bc437 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -424,11 +424,7 @@ func GenerateReleaseNotes(ctx *context.Context) {
PreviousTag: form.PreviousTag,
})
if err != nil {
- if errTr := util.ErrorAsTranslatable(err); errTr != nil {
- ctx.JSONError(errTr.Translate(ctx.Locale))
- } else {
- ctx.ServerError("GenerateReleaseNotes", err)
- }
+ ctx.JSONErrorAuto(err)
return
}
diff --git a/routers/web/repo/view_file.go b/routers/web/repo/view_file.go
index 3535ed7c4e0..398c4ad8cd9 100644
--- a/routers/web/repo/view_file.go
+++ b/routers/web/repo/view_file.go
@@ -162,7 +162,7 @@ type fileCodeOwner struct {
func prepareFileCodeOwners(ctx *context.Context) {
rules, warnings1, err := issue_service.GetCodeOwnerRules(ctx, ctx.Repo.GitRepo, ctx.Repo.Commit)
- if msg, _ := util.ErrorUnwrapForUser(err, ctx.Locale); msg != "" {
+ if msg, _ := util.ErrorUnwrapForHTML(err, ctx.Locale); msg != "" {
ctx.Flash.Error(msg, true)
return
} else if err != nil {
diff --git a/routers/web/shared/user/block.go b/routers/web/shared/user/block.go
index beaed239fb5..92354f1cd39 100644
--- a/routers/web/shared/user/block.go
+++ b/routers/web/shared/user/block.go
@@ -70,11 +70,7 @@ func BlockedUsersPost(ctx *context.Context, blocker *user_model.User, redirect s
err := blockedUsersPost(ctx, form, blocker)
if err == nil {
ctx.JSONRedirect(redirect)
- } else if errTr := util.ErrorAsTranslatable(err); errTr != nil {
- ctx.JSONError(errTr.Translate(ctx.Locale))
- } else if errors.Is(err, util.ErrNotExist) {
- ctx.JSONError(ctx.Locale.Tr("error.not_found"))
} else {
- ctx.ServerError("BlockedUsersPost", err)
+ ctx.JSONErrorAuto(err)
}
}
diff --git a/routers/web/user/package.go b/routers/web/user/package.go
index 991c8c6f573..ffd9ff7cc52 100644
--- a/routers/web/user/package.go
+++ b/routers/web/user/package.go
@@ -496,12 +496,7 @@ func packageSettingsPostActionDelete(ctx *context.Context) {
return
}
if err := packages_service.RemovePackage(ctx, ctx.Doer, pd.Package); err != nil {
- errTr := util.ErrorAsTranslatable(err)
- if errTr == nil {
- ctx.ServerError("RemovePackage", err)
- return
- }
- ctx.Flash.Error(errTr.Translate(ctx.Locale))
+ ctx.FlashErrorAuto(err)
ctx.Redirect(pd.PackageSettingsLink())
return
}
@@ -519,15 +514,11 @@ func PackageVersionDelete(ctx *context.Context) {
}
if err := packages_service.RemovePackageVersion(ctx, ctx.Doer, pd.Version); err != nil {
- errTr := util.ErrorAsTranslatable(err)
- if errTr == nil {
- ctx.ServerError("RemovePackageVersion", err)
- return
- }
- ctx.Flash.Error(errTr.Translate(ctx.Locale))
- } else {
- ctx.Flash.Success(ctx.Tr("packages.settings.delete.version.success"))
+ ctx.FlashErrorAuto(err)
+ ctx.Redirect(pd.VersionWebLink())
+ return
}
+ ctx.Flash.Success(ctx.Tr("packages.settings.delete.version.success"))
// redirect to the package if there are still versions available
redirectURL := ctx.Package.Owner.HomeLink() + "/-/packages"
diff --git a/services/context/context.go b/services/context/context.go
index 61e91bfe8db..48a0deaa396 100644
--- a/services/context/context.go
+++ b/services/context/context.go
@@ -6,11 +6,8 @@ package context
import (
"context"
- "fmt"
- "html/template"
"io"
"net/http"
- "net/url"
"strings"
"gitea.dev/models/unit"
@@ -18,13 +15,11 @@ import (
"gitea.dev/modules/cache"
"gitea.dev/modules/httpcache"
"gitea.dev/modules/httplib"
- "gitea.dev/modules/log"
"gitea.dev/modules/reqctx"
"gitea.dev/modules/session"
"gitea.dev/modules/setting"
"gitea.dev/modules/templates"
"gitea.dev/modules/translation"
- "gitea.dev/modules/util"
"gitea.dev/modules/validation"
"gitea.dev/modules/web"
"gitea.dev/modules/web/middleware"
@@ -122,7 +117,7 @@ func NewWebContext(base *Base, render Render, session session.Store) *Context {
Org: &Organization{},
}
ctx.TemplateContext = NewTemplateContextForWeb(ctx, ctx.Base.Req, ctx.Base.Locale)
- ctx.Flash = &middleware.Flash{DataStore: ctx, Values: url.Values{}}
+ ctx.Flash = &middleware.Flash{DataStore: ctx}
ctx.SetContextValue(WebContextKey, ctx)
httplib.MarkRequestSupportPublicURL(ctx)
return ctx
@@ -163,13 +158,13 @@ func Contexter() func(next http.Handler) http.Handler {
// get the last flash message from cookie
lastFlashCookie, lastFlashMsg := middleware.GetSiteCookieFlashMessage(ctx, ctx.Req, CookieNameFlash)
- if vals, _ := url.ParseQuery(lastFlashCookie); len(vals) > 0 {
+ if lastFlashMsg != nil {
ctx.Data["Flash"] = lastFlashMsg // store last Flash message into the template data, to render it
}
// if there are new messages in the ctx.Flash, write them into cookie
ctx.Resp.Before(func(resp ResponseWriter) {
- if val := ctx.Flash.Encode(); val != "" {
+ if val := ctx.Flash.EncodeToString(); val != "" {
middleware.SetSiteCookie(ctx.Resp, CookieNameFlash, val, 0)
} else if lastFlashCookie != "" {
middleware.SetSiteCookie(ctx.Resp, CookieNameFlash, "", -1)
@@ -236,61 +231,6 @@ func (ctx *Context) GetErrMsg() string {
return msg
}
-func (ctx *Context) JSONRedirect(redirect string) {
- ctx.JSON(http.StatusOK, map[string]any{"redirect": redirect})
-}
-
-func (ctx *Context) JSONOK() {
- ctx.JSON(http.StatusOK, map[string]any{"ok": true}) // this is only a dummy response, frontend seldom uses it
-}
-
-func buildJsonErrorMap[T string | template.HTML](msg T) map[string]any {
- switch v := any(msg).(type) {
- case string:
- return map[string]any{"errorMessage": v, "renderFormat": "text"}
- case template.HTML:
- return map[string]any{"errorMessage": v, "renderFormat": "html"}
- }
- panic(fmt.Sprintf("unsupported type: %T", msg))
-}
-
-func (ctx *Context) JSONErrorAuto(err error) {
- if errTr := util.ErrorAsTranslatable(err); errTr != nil {
- msg := errTr.Translate(ctx.Locale)
- ctx.JSON(http.StatusBadRequest, buildJsonErrorMap(msg))
- return
- }
- errMsg, httpCode := util.ErrorUnwrapForUser(err)
- if errMsg != "" {
- ctx.JSON(httpCode, buildJsonErrorMap(errMsg))
- return
- }
-
- logLevel := util.Iif(httplib.IsClientOrNetworkError(ctx, err), log.DEBUG, log.ERROR)
- log.Log(1, logLevel, "JSONErrorAuto: server internal error: %v", err)
-
- userErrorMsg := ctx.buildUserErrorMessage("internal server error", err)
- ctx.JSON(http.StatusInternalServerError, buildJsonErrorMap(userErrorMsg))
-}
-
-func (ctx *Context) JSONError[T string | template.HTML](msg T) {
- ctx.JSON(http.StatusBadRequest, buildJsonErrorMap(msg))
-}
-
-func (ctx *Context) JSONErrorWithField[T string | template.HTML](msg T, field string) {
- m := buildJsonErrorMap(msg)
- m["errorFields"] = []string{field}
- ctx.JSON(http.StatusBadRequest, m)
-}
-
-func (ctx *Context) JSONErrorNotFound(optMsg ...string) {
- msg := util.OptionalArg(optMsg)
- if msg == "" {
- msg = ctx.Locale.TrString("error.not_found")
- }
- ctx.JSON(http.StatusNotFound, buildJsonErrorMap(msg))
-}
-
func GetFetchActionForm[T middleware.Form](ctx *Context) (ret T) {
if web.IsFormSet(ctx) {
panic("don't mix fetch-action form validation with template-based form validation")
diff --git a/services/context/context_response.go b/services/context/context_response.go
index 1ef3267db24..19337e535f3 100644
--- a/services/context/context_response.go
+++ b/services/context/context_response.go
@@ -6,6 +6,7 @@ package context
import (
"errors"
"fmt"
+ "html"
"html/template"
"net/http"
"net/url"
@@ -114,7 +115,7 @@ func (ctx *Context) RenderToHTML(name templates.TplName, data any) (template.HTM
// WARNING: in many cases, this function is not able to render the page or recover the form fields correctly.
// And it is very difficult to test the page rendered by this function.
// DO NOT USE IT ANYMORE.
-func (ctx *Context) RenderWithErrDeprecated(msg any, tpl templates.TplName, form any) {
+func (ctx *Context) RenderWithErrDeprecated[T string | template.HTML](msg T, tpl templates.TplName, form any) {
if form != nil {
middleware.AssignForm(form, ctx.Data)
}
@@ -153,7 +154,7 @@ func (ctx *Context) notFoundInternal(skip int, logMsg string, logErr error) {
ctx.HTML(http.StatusNotFound, "status/404")
}
-func (ctx *Context) buildUserErrorMessage(msg string, err error) (userErrorMsg string) {
+func (ctx *Context) buildServerErrorMessageForUser(msg string, err error) (userErrorMsg string) {
// it's safe to show internal error to admin users, and it helps
if !setting.IsProd || setting.IsInTesting || (ctx.Doer != nil && ctx.Doer.IsAdmin) {
userErrorMsg = msg
@@ -164,6 +165,70 @@ func (ctx *Context) buildUserErrorMessage(msg string, err error) (userErrorMsg s
return util.IfZero(userErrorMsg, ctx.Locale.TrString("error.occurred"))
}
+func (ctx *Context) FlashErrorAuto(err error) {
+ errMsg, _ := util.ErrorUnwrapForHTML(err, ctx.Locale)
+ if errMsg != "" {
+ ctx.Flash.Error(errMsg)
+ return
+ }
+
+ logLevel := util.Iif(httplib.IsClientOrNetworkError(ctx, err), log.DEBUG, log.ERROR)
+ log.Log(1, logLevel, "FlashErrorAuto: server internal error: %v", err)
+
+ userErrorMsg := ctx.buildServerErrorMessageForUser("internal server error", err)
+ ctx.Flash.Error(html.EscapeString(userErrorMsg)) // flash renders HTML with sanitization, so escape the message to keep original content
+}
+
+func (ctx *Context) JSONRedirect(redirect string) {
+ ctx.JSON(http.StatusOK, map[string]any{"redirect": redirect})
+}
+
+func (ctx *Context) JSONOK() {
+ ctx.JSON(http.StatusOK, map[string]any{"ok": true}) // this is only a dummy response, frontend seldom uses it
+}
+
+func buildJsonErrorMap[T string | template.HTML](msg T) map[string]any {
+ switch v := any(msg).(type) {
+ case string:
+ return map[string]any{"errorMessage": v, "renderFormat": "text"}
+ case template.HTML:
+ return map[string]any{"errorMessage": v, "renderFormat": "html"}
+ }
+ panic(fmt.Sprintf("unsupported type: %T", msg))
+}
+
+func (ctx *Context) JSONErrorAuto(err error) {
+ errMsg, httpCode := util.ErrorUnwrapForHTML(err, ctx.Locale)
+ if errMsg != "" {
+ ctx.JSON(httpCode, buildJsonErrorMap(errMsg))
+ return
+ }
+
+ logLevel := util.Iif(httplib.IsClientOrNetworkError(ctx, err), log.DEBUG, log.ERROR)
+ log.Log(1, logLevel, "JSONErrorAuto: server internal error: %v", err)
+
+ userErrorMsg := ctx.buildServerErrorMessageForUser("internal server error", err)
+ ctx.JSON(http.StatusInternalServerError, buildJsonErrorMap(userErrorMsg))
+}
+
+func (ctx *Context) JSONError[T string | template.HTML](msg T) {
+ ctx.JSON(http.StatusBadRequest, buildJsonErrorMap(msg))
+}
+
+func (ctx *Context) JSONErrorWithField[T string | template.HTML](msg T, field string) {
+ m := buildJsonErrorMap(msg)
+ m["errorFields"] = []string{field}
+ ctx.JSON(http.StatusBadRequest, m)
+}
+
+func (ctx *Context) JSONErrorNotFound(optMsg ...string) {
+ msg := util.OptionalArg(optMsg)
+ if msg == "" {
+ msg = ctx.Locale.TrString("error.not_found")
+ }
+ ctx.JSON(http.StatusNotFound, buildJsonErrorMap(msg))
+}
+
// ServerError displays a 500 (Internal Server Error) page and prints the given error, if any.
// If the error is controlled by our error system, a related 404 page can be displayed instead.
// TODO: refactor this function like APIErrorAuto in the future, and handle more error types and http codes.
@@ -185,7 +250,7 @@ func (ctx *Context) serverErrorInternal(skip int, logMsg string, logErr error) {
log.Log(skip+1, logLevel, "%s: %v", logMsg, logErr)
}
- userErrorMsg := ctx.buildUserErrorMessage(logMsg, logErr)
+ userErrorMsg := ctx.buildServerErrorMessageForUser(logMsg, logErr)
if httplib.IsGiteaFetchActionRequest(ctx.Req) {
ctx.JSON(http.StatusInternalServerError, buildJsonErrorMap(userErrorMsg))
return
diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go
index fc05617ae2a..62444316079 100644
--- a/tests/integration/api_issue_test.go
+++ b/tests/integration/api_issue_test.go
@@ -588,7 +588,7 @@ func testAPIIssueAssignees(t *testing.T) {
AddTokenAuth(token)
resp := MakeRequest(t, req, http.StatusUnprocessableEntity)
apiErr := DecodeJSON(t, resp, &api.APIError{})
- assert.Equal(t, "user does not exist [uid: 0, name: does-not-exist]", apiErr.Message)
+ assert.Equal(t, "user does not exist [name: does-not-exist]", apiErr.Message)
})
t.Run("OrganizationAssignee", func(t *testing.T) {
diff --git a/tests/integration/project_workflow_test.go b/tests/integration/project_workflow_test.go
index 61331ea3a2d..3d401f0737e 100644
--- a/tests/integration/project_workflow_test.go
+++ b/tests/integration/project_workflow_test.go
@@ -50,7 +50,7 @@ func TestProjectWorkflowsWeb(t *testing.T) {
assert.Equal(t, workflow.Actions, updated.Actions)
req = NewRequestWithJSON(t, "POST", link, &api.CreateProjectWorkflowOption{Event: "item_closed"})
- resp := session.MakeRequest(t, req, http.StatusBadRequest)
+ resp := session.MakeRequest(t, req, http.StatusUnprocessableEntity)
assert.Equal(t, "At least one action must be configured", DecodeJSON(t, resp, map[string]any{})["errorMessage"])
loginUser(t, "user4").MakeRequest(t, NewRequest(t, "POST", workflowLink+"/delete"), http.StatusNotFound)
diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go
index 9f4460e1557..dd806a97608 100644
--- a/tests/integration/pull_create_test.go
+++ b/tests/integration/pull_create_test.go
@@ -115,7 +115,7 @@ func testPullCreateDirectly(t *testing.T, session *TestSession, opts createPullR
return resp
}
-func testPullCreateFailure(t *testing.T, session *TestSession, baseRepoOwner, baseRepoName, baseBranch, headRepoOwner, headRepoName, headBranch, title string) *httptest.ResponseRecorder {
+func testPullCreateForbidden(t *testing.T, session *TestSession, baseRepoOwner, baseRepoName, baseBranch, headRepoOwner, headRepoName, headBranch, title string) *httptest.ResponseRecorder {
headCompare := headBranch
if headRepoOwner != "" {
if headRepoName != "" {
@@ -134,7 +134,7 @@ func testPullCreateFailure(t *testing.T, session *TestSession, baseRepoOwner, ba
req = NewRequestWithValues(t, "POST", link, map[string]string{
"title": title,
})
- resp = session.MakeRequest(t, req, http.StatusBadRequest)
+ resp = session.MakeRequest(t, req, http.StatusForbidden)
return resp
}
@@ -477,7 +477,8 @@ func TestCreatePullWhenBlocked(t *testing.T) {
testEditFile(t, sessionFork, ForkOwner, "forkrepo1", "master", "README.md", "Hello, World (Edited)\n")
// 3. User1 attempts to create a pull request
- testPullCreateFailure(t, sessionFork, RepoOwner, "repo1", "master", ForkOwner, "forkrepo1", "master", "This is a pull title")
+ resp := testPullCreateForbidden(t, sessionFork, RepoOwner, "repo1", "master", ForkOwner, "forkrepo1", "master", "This is a pull title")
+ assert.Equal(t, "Cannot create an issue or pull request because you are blocked by the repository owner.", test.ParseJSONError(resp.Body.Bytes()).ErrorMessage)
// Teardown
// Unblock user
diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go
index fc292239fd7..e183ba22543 100644
--- a/tests/integration/pull_review_test.go
+++ b/tests/integration/pull_review_test.go
@@ -61,7 +61,13 @@ func testPullReviewReviewerMissed(t *testing.T) {
func testPullReviewLockedOrBlocked(t *testing.T) {
require.NoError(t, issues_model.UpdateIssueCols(t.Context(), &issues_model.Issue{ID: 3, IsLocked: true}, "is_locked"))
- for _, tc := range []struct{ reviewerID, index, replyCommentID int64 }{{4, 3, 7}, {34, 2, 4}} {
+ for _, tc := range []struct {
+ reviewerID, index, replyCommentID int64
+ webStatus int
+ }{
+ {4, 3, 7, http.StatusBadRequest},
+ {34, 2, 4, http.StatusForbidden},
+ } {
reviewer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: tc.reviewerID})
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: 1, Index: tc.index})
pendingReview, err := issues_model.CreateReview(t.Context(), issues_model.CreateReviewOptions{Type: issues_model.ReviewTypePending, Issue: issue, Reviewer: reviewer})
@@ -71,10 +77,10 @@ func testPullReviewLockedOrBlocked(t *testing.T) {
session := loginUser(t, reviewer.Name)
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
- testSubmitReview(t, session, "user2", "repo1", strconv.FormatInt(tc.index, 10), "", "comment", http.StatusBadRequest)
+ testSubmitReview(t, session, "user2", "repo1", strconv.FormatInt(tc.index, 10), "", "comment", tc.webStatus)
session.MakeRequest(t, NewRequestWithValues(t, "POST", "/"+pullPath+"/files/reviews/comments", map[string]string{
"origin": "diff", "content": "test", "path": "README.md", "side": "proposed", "line": "1",
- }), http.StatusBadRequest)
+ }), tc.webStatus)
MakeRequest(t, NewRequestWithJSON(t, "POST", "/api/v1/repos/"+pullPath+"/reviews", &api.CreatePullReviewOptions{Event: api.ReviewStateComment, Body: "test"}).AddTokenAuth(token), http.StatusForbidden)
MakeRequest(t, NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/reviews/%d", pullPath, pendingReview.ID), &api.SubmitPullReviewOptions{Event: api.ReviewStateComment, Body: "test"}).AddTokenAuth(token), http.StatusForbidden)
MakeRequest(t, NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/comments/%d/replies", pullPath, tc.replyCommentID), &api.CreatePullReviewCommentReplyOptions{Body: "test"}).AddTokenAuth(token), http.StatusForbidden)
@@ -82,7 +88,7 @@ func testPullReviewLockedOrBlocked(t *testing.T) {
}
MakeRequest(t, NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/pulls/3/reviews", &api.CreatePullReviewOptions{Event: api.ReviewStateComment, Body: "test"}).AddTokenAuth(getUserToken(t, "user2", auth_model.AccessTokenScopeWriteRepository)), http.StatusOK)
- for name, status := range map[string]int{"user5": http.StatusBadRequest, "user40": http.StatusOK} {
+ for name, status := range map[string]int{"user5": http.StatusForbidden, "user40": http.StatusOK} {
require.NoError(t, db.Insert(t.Context(), &user_model.Blocking{BlockerID: 1, BlockeeID: unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name}).ID}))
testSubmitReview(t, loginUser(t, name), "user2", "repo1", "2", "", "comment", status)
}
diff --git a/tests/integration/webauthn_test.go b/tests/integration/webauthn_test.go
index a86988201dc..109827e1f68 100644
--- a/tests/integration/webauthn_test.go
+++ b/tests/integration/webauthn_test.go
@@ -69,7 +69,7 @@ func TestWebAuthnRename(t *testing.T) {
rename(cred.ID, "RENAMED credential", http.StatusOK)
unittest.AssertExistsAndLoadBean(t, &auth_model.WebAuthnCredential{ID: cred.ID, Name: "RENAMED credential"})
- resp := rename(cred.ID, "other CREDENTIAL", http.StatusBadRequest)
+ resp := rename(cred.ID, "other CREDENTIAL", http.StatusConflict)
assert.Equal(t, "A security key with the same nickname already exists.", test.ParseJSONError(resp.Body.Bytes()).ErrorMessage)
unittest.AssertExistsAndLoadBean(t, &auth_model.WebAuthnCredential{ID: cred.ID, Name: "RENAMED credential"})