DanielPantle/vikunja
1
0
Fork 0
forked from vikunja/vikunja
Code Pull Requests Activity

chore(web): use web auth factory directly

Browse Source
This commit is contained in:
kolaente 2024-09-01 19:25:24 +02:00
parent 14c862d284
commit 9b01666ec6
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
7 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/routes/routes.go
View File

@ -60,7 +60,6 @@ import (
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/models"
"code.vikunja.io/api/pkg/modules/auth"
"code.vikunja.io/api/pkg/modules/auth/openid"
"code.vikunja.io/api/pkg/modules/background"
backgroundHandler "code.vikunja.io/api/pkg/modules/background/handler"
@ -76,7 +75,6 @@ import (
apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
"code.vikunja.io/api/pkg/routes/caldav"
"code.vikunja.io/api/pkg/version"
"code.vikunja.io/api/pkg/web"
"code.vikunja.io/api/pkg/web/handler"
"github.com/getsentry/sentry-go"
@ -119,9 +117,6 @@ func NewEcho() *echo.Echo {
e.Validator = &CustomValidator{}
// Handler config
handler.SetAuthProvider(&web.Auths{
AuthObject: auth.GetAuthFromClaims,
})
handler.SetLoggingProvider(log.GetLogger())
return e

7
pkg/web/handler/config.go
View File

@ -17,13 +17,11 @@
package handler
import (
"code.vikunja.io/api/pkg/web"
"github.com/op/go-logging"
)
// Config contains the config for the web handler
type Config struct {
AuthProvider *web.Auths
LoggingProvider *logging.Logger
}
@ -33,11 +31,6 @@ func init() {
config = &Config{}
}
// SetAuthProvider sets the auth provider in config
func SetAuthProvider(provider *web.Auths) {
config.AuthProvider = provider
}
// SetLoggingProvider sets the logging provider in the config
func SetLoggingProvider(logger *logging.Logger) {
config.LoggingProvider = logger

3
pkg/web/handler/create.go
View File

@ -22,6 +22,7 @@ import (
"net/http"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/modules/auth"
"github.com/labstack/echo/v4"
)
@ -47,7 +48,7 @@ func (c *WebHandler) CreateWeb(ctx echo.Context) error {
}
// Get the user to pass for later checks
currentAuth, err := config.AuthProvider.AuthObject(ctx)
currentAuth, err := auth.GetAuthFromClaims(ctx)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.")
}

3
pkg/web/handler/delete.go
View File

@ -22,6 +22,7 @@ import (
"net/http"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/modules/auth"
"github.com/labstack/echo/v4"
)
@ -47,7 +48,7 @@ func (c *WebHandler) DeleteWeb(ctx echo.Context) error {
}
// Check if the user has the right to delete
currentAuth, err := config.AuthProvider.AuthObject(ctx)
currentAuth, err := auth.GetAuthFromClaims(ctx)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError)
}

3
pkg/web/handler/read_all.go
View File

@ -25,6 +25,7 @@ import (
vconfig "code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/modules/auth"
"github.com/labstack/echo/v4"
)
@ -34,7 +35,7 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error {
// Get our model
currentStruct := c.EmptyStruct()
currentAuth, err := config.AuthProvider.AuthObject(ctx)
currentAuth, err := auth.GetAuthFromClaims(ctx)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.")
}

3
pkg/web/handler/read_one.go
View File

@ -23,6 +23,7 @@ import (
"strconv"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/modules/auth"
"github.com/labstack/echo/v4"
)
@ -43,7 +44,7 @@ func (c *WebHandler) ReadOneWeb(ctx echo.Context) error {
}
// Check rights
currentAuth, err := config.AuthProvider.AuthObject(ctx)
currentAuth, err := auth.GetAuthFromClaims(ctx)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.")
}

3
pkg/web/handler/update.go
View File

@ -22,6 +22,7 @@ import (
"net/http"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/modules/auth"
"github.com/labstack/echo/v4"
)
@ -48,7 +49,7 @@ func (c *WebHandler) UpdateWeb(ctx echo.Context) error {
}
// Check if the user has the right to do that
currentAuth, err := config.AuthProvider.AuthObject(ctx)
currentAuth, err := auth.GetAuthFromClaims(ctx)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Could not determine the current user.")
}