fine tune

modules/context/package.go

@@ -30,8 +30,8 @@ type packageAssignmentCtx struct {
 	ContextUser *user_model.User
 }
 
-// PackageAssignmentWeb returns a middleware to handle Context.Package assignment
-func PackageAssignmentWeb() func(ctx *Context) {
+// PackageAssignment returns a middleware to handle Context.Package assignment
+func PackageAssignment() func(ctx *Context) {
 	return func(ctx *Context) {
 		errorFn := func(status int, title string, obj interface{}) {
 			err, ok := obj.(error)

modules/test/context_tests.go

@@ -25,19 +25,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type mockRender struct{}
-
-func (tr *mockRender) TemplateLookup(tmpl string) (templates.TemplateExecutor, error) {
-	return nil, nil
-}
-
-func (tr *mockRender) HTML(w io.Writer, status int, _ string, _ interface{}) error {
-	if resp, ok := w.(http.ResponseWriter); ok {
-		resp.WriteHeader(status)
-	}
-	return nil
-}
-
 // MockContext mock context for unit tests
 // TODO: move this function to other packages, because it depends on "models" package
 func MockContext(t *testing.T, path string) *context.Context {
@@ -158,3 +145,16 @@ func LoadGitRepo(t *testing.T, ctx *context.Context) {
 	ctx.Repo.GitRepo, err = git.OpenRepository(ctx, ctx.Repo.Repository.RepoPath())
 	assert.NoError(t, err)
 }
+
+type mockRender struct{}
+
+func (tr *mockRender) TemplateLookup(tmpl string) (templates.TemplateExecutor, error) {
+	return nil, nil
+}
+
+func (tr *mockRender) HTML(w io.Writer, status int, _ string, _ interface{}) error {
+	if resp, ok := w.(http.ResponseWriter); ok {
+		resp.WriteHeader(status)
+	}
+	return nil
+}

routers/api/packages/api.go

@@ -563,7 +563,7 @@ func CommonRoutes(ctx gocontext.Context) *web.Route {
 				})
 			})
 		}, reqPackageAccess(perm.AccessModeRead))
-	}, context_service.UserAssignmentWeb(), context.PackageAssignmentWeb())
+	}, context_service.UserAssignmentWeb(), context.PackageAssignment())
 
 	return r
 }
@@ -730,7 +730,7 @@ func ContainerRoutes(ctx gocontext.Context) *web.Route {
 
 			ctx.Status(http.StatusNotFound)
 		})
-	}, container.ReqContainerAccess, context_service.UserAssignmentWeb(), context.PackageAssignmentWeb(), reqPackageAccess(perm.AccessModeRead))
+	}, container.ReqContainerAccess, context_service.UserAssignmentWeb(), context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
 
 	return r
 }

routers/web/web.go

@@ -814,7 +814,7 @@ func registerRoutes(m *web.Route) {
 						}, reqPackageAccess(perm.AccessModeWrite))
 					})
 				})
-			}, context.PackageAssignmentWeb(), reqPackageAccess(perm.AccessModeRead))
+			}, context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
 		}
 
 		m.Group("/projects", func() {

services/auth/middleware.go

@@ -40,6 +40,7 @@ func APIAuth(authMethod Method) func(*context.APIContext) {
 		ar, err := authShared(ctx.Base, nil, authMethod)
 		if err != nil {
 			ctx.Error(http.StatusUnauthorized, "APIAuth", err)
+			return
 		}
 		ctx.Doer = ar.Doer
 		ctx.IsSigned = ar.Doer != nil