fix backport

Author: wxiaoguang

routers/api/v1/api.go

@@ -356,7 +356,7 @@ func reqToken() func(ctx *context.APIContext) {
 
 func reqExploreSignIn() func(ctx *context.APIContext) {
 	return func(ctx *context.APIContext) {
-		if (setting.Service.RequireSignInView || setting.Service.Explore.RequireSigninView) && !ctx.IsSigned {
+		if (setting.Service.RequireSignInViewStrict || setting.Service.Explore.RequireSigninView) && !ctx.IsSigned {
 			ctx.Error(http.StatusUnauthorized, "reqExploreSignIn", "you must be signed in to search for users")
 		}
 	}

routers/common/blockexpensive.go

@@ -4,11 +4,11 @@
 package common
 
 import (
+	"context"
 	"net/http"
 	"strings"
 
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/reqctx"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/web/middleware"
 
@@ -21,7 +21,7 @@ func BlockExpensive() func(next http.Handler) http.Handler {
 	}
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			ret := determineRequestPriority(reqctx.FromContext(req.Context()))
+			ret := determineRequestPriority(req.Context())
 			if !ret.SignedIn {
 				if ret.Expensive || ret.LongPolling {
 					http.Redirect(w, req, setting.AppSubURL+"/user/login", http.StatusSeeOther)
@@ -73,14 +73,15 @@ func isRoutePathForLongPolling(routePattern string) bool {
 	return routePattern == "/user/events"
 }
 
-func determineRequestPriority(reqCtx reqctx.RequestContext) (ret struct {
+func determineRequestPriority(ctx context.Context) (ret struct {
 	SignedIn    bool
 	Expensive   bool
 	LongPolling bool
 },
 ) {
-	chiRoutePath := chi.RouteContext(reqCtx).RoutePattern()
-	if _, ok := reqCtx.GetData()[middleware.ContextDataKeySignedUser].(*user_model.User); ok {
+	dataStore := middleware.GetContextData(ctx)
+	chiRoutePath := chi.RouteContext(ctx).RoutePattern()
+	if _, ok := dataStore[middleware.ContextDataKeySignedUser].(*user_model.User); ok {
 		ret.SignedIn = true
 	} else {
 		ret.Expensive = isRoutePathExpensive(chiRoutePath)

tests/integration/api_org_test.go

@@ -148,9 +148,9 @@ func TestAPIOrgEditBadVisibility(t *testing.T) {
 
 func TestAPIOrgDeny(t *testing.T) {
 	onGiteaRun(t, func(*testing.T, *url.URL) {
-		setting.Service.RequireSignInView = true
+		setting.Service.RequireSignInViewStrict = true
 		defer func() {
-			setting.Service.RequireSignInView = false
+			setting.Service.RequireSignInViewStrict = false
 		}()
 
 		orgName := "user1_org"

tests/integration/signin_test.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/markbates/goth"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func testLoginFailed(t *testing.T, username, password, message string) {