Skip to content

Commit 2de3d6a

Browse files
committed
fine tune
1 parent 0ee21bf commit 2de3d6a

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

modules/context/package.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ type packageAssignmentCtx struct {
3030
ContextUser *user_model.User
3131
}
3232

33-
// PackageAssignmentWeb returns a middleware to handle Context.Package assignment
34-
func PackageAssignmentWeb() func(ctx *Context) {
33+
// PackageAssignment returns a middleware to handle Context.Package assignment
34+
func PackageAssignment() func(ctx *Context) {
3535
return func(ctx *Context) {
3636
errorFn := func(status int, title string, obj interface{}) {
3737
err, ok := obj.(error)

modules/test/context_tests.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,6 @@ import (
2525
"github.com/stretchr/testify/assert"
2626
)
2727

28-
type mockRender struct{}
29-
30-
func (tr *mockRender) TemplateLookup(tmpl string) (templates.TemplateExecutor, error) {
31-
return nil, nil
32-
}
33-
34-
func (tr *mockRender) HTML(w io.Writer, status int, _ string, _ interface{}) error {
35-
if resp, ok := w.(http.ResponseWriter); ok {
36-
resp.WriteHeader(status)
37-
}
38-
return nil
39-
}
40-
4128
// MockContext mock context for unit tests
4229
// TODO: move this function to other packages, because it depends on "models" package
4330
func MockContext(t *testing.T, path string) *context.Context {
@@ -158,3 +145,16 @@ func LoadGitRepo(t *testing.T, ctx *context.Context) {
158145
ctx.Repo.GitRepo, err = git.OpenRepository(ctx, ctx.Repo.Repository.RepoPath())
159146
assert.NoError(t, err)
160147
}
148+
149+
type mockRender struct{}
150+
151+
func (tr *mockRender) TemplateLookup(tmpl string) (templates.TemplateExecutor, error) {
152+
return nil, nil
153+
}
154+
155+
func (tr *mockRender) HTML(w io.Writer, status int, _ string, _ interface{}) error {
156+
if resp, ok := w.(http.ResponseWriter); ok {
157+
resp.WriteHeader(status)
158+
}
159+
return nil
160+
}

routers/api/packages/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ func CommonRoutes(ctx gocontext.Context) *web.Route {
563563
})
564564
})
565565
}, reqPackageAccess(perm.AccessModeRead))
566-
}, context_service.UserAssignmentWeb(), context.PackageAssignmentWeb())
566+
}, context_service.UserAssignmentWeb(), context.PackageAssignment())
567567

568568
return r
569569
}
@@ -730,7 +730,7 @@ func ContainerRoutes(ctx gocontext.Context) *web.Route {
730730

731731
ctx.Status(http.StatusNotFound)
732732
})
733-
}, container.ReqContainerAccess, context_service.UserAssignmentWeb(), context.PackageAssignmentWeb(), reqPackageAccess(perm.AccessModeRead))
733+
}, container.ReqContainerAccess, context_service.UserAssignmentWeb(), context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
734734

735735
return r
736736
}

routers/web/web.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ func registerRoutes(m *web.Route) {
814814
}, reqPackageAccess(perm.AccessModeWrite))
815815
})
816816
})
817-
}, context.PackageAssignmentWeb(), reqPackageAccess(perm.AccessModeRead))
817+
}, context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
818818
}
819819

820820
m.Group("/projects", func() {

services/auth/middleware.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func APIAuth(authMethod Method) func(*context.APIContext) {
4040
ar, err := authShared(ctx.Base, nil, authMethod)
4141
if err != nil {
4242
ctx.Error(http.StatusUnauthorized, "APIAuth", err)
43+
return
4344
}
4445
ctx.Doer = ar.Doer
4546
ctx.IsSigned = ar.Doer != nil

0 commit comments

Comments
 (0)