Skip to content

Commit 55a600f

Browse files
authored
Move code from module to service (#24287)
The code should not be in `modules/` but `services/`. Reference: #24257 (comment)
1 parent b2248d2 commit 55a600f

File tree

4 files changed

+189
-201
lines changed

4 files changed

+189
-201
lines changed

modules/context/auth.go

-194
This file was deleted.

routers/api/v1/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ func Routes(ctx gocontext.Context) *web.Route {
689689
// Get user from session if logged in.
690690
m.Use(auth.APIAuth(group))
691691

692-
m.Use(context.ToggleAPI(&context.ToggleOptions{
692+
m.Use(auth.VerifyAuthWithOptionsAPI(&auth.VerifyOptions{
693693
SignInRequired: setting.Service.RequireSignInView,
694694
}))
695695

routers/web/web.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,11 @@ func Routes(ctx gocontext.Context) *web.Route {
228228

229229
// RegisterRoutes register routes
230230
func RegisterRoutes(m *web.Route) {
231-
reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: true})
232-
ignSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: setting.Service.RequireSignInView})
233-
ignExploreSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: setting.Service.RequireSignInView || setting.Service.Explore.RequireSigninView})
234-
ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true})
235-
reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true})
231+
reqSignIn := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignInRequired: true})
232+
ignSignIn := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignInRequired: setting.Service.RequireSignInView})
233+
ignExploreSignIn := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignInRequired: setting.Service.RequireSignInView || setting.Service.Explore.RequireSigninView})
234+
ignSignInAndCsrf := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{DisableCSRF: true})
235+
reqSignOut := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignOutRequired: true})
236236
validation.AddBindingRules()
237237

238238
linkAccountEnabled := func(ctx *context.Context) {
@@ -551,7 +551,7 @@ func RegisterRoutes(m *web.Route) {
551551

552552
m.Get("/avatar/{hash}", user.AvatarByEmailHash)
553553

554-
adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true})
554+
adminReq := auth_service.VerifyAuthWithOptions(&auth_service.VerifyOptions{SignInRequired: true, AdminRequired: true})
555555

556556
// ***** START: Admin *****
557557
m.Group("/admin", func() {

0 commit comments

Comments
 (0)