ami/tl-vikunja
1
0
Fork 0
Code Activity

chore(web): remove unused echo context

Browse Source 
(cherry picked from commit 329de3aab3cf0f15759ef1e20e865d3ad801d56e)
This commit is contained in:
kolaente
2024-08-29 16:20:39 +02:00
parent be8ecb6d36
commit 198b2e3b70
29 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/modules/auth/openid/openid.go
View File

@ -101,7 +101,7 @@ func HandleCallback(c echo.Context) error {
log.Debugf("Provider: %v", provider)
if err != nil {
log.Error(err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if provider == nil {
return c.JSON(http.StatusBadRequest, models.Message{Message: "Provider does not exist"})
@ -119,7 +119,7 @@ func HandleCallback(c echo.Context) error {
details := make(map[string]interface{})
if err := json.Unmarshal(rerr.Body, &details); err != nil {
log.Errorf("Error unmarshalling token for provider %s: %v", provider.Name, err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusBadRequest, map[string]interface{}{
@ -128,7 +128,7 @@ func HandleCallback(c echo.Context) error {
})
}
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Extract the ID Token from OAuth2 token.
@ -143,7 +143,7 @@ func HandleCallback(c echo.Context) error {
idToken, err := verifier.Verify(context.Background(), rawIDToken)
if err != nil {
log.Errorf("Error verifying token for provider %s: %v", provider.Name, err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Extract custom claims
@ -152,21 +152,21 @@ func HandleCallback(c echo.Context) error {
err = idToken.Claims(cl)
if err != nil {
log.Errorf("Error getting token claims for provider %s: %v", provider.Name, err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if cl.Email == "" || cl.Name == "" || cl.PreferredUsername == "" {
info, err := provider.openIDProvider.UserInfo(context.Background(), provider.Oauth2Config.TokenSource(context.Background(), oauth2Token))
if err != nil {
log.Errorf("Error getting userinfo for provider %s: %v", provider.Name, err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
cl2 := &claims{}
err = info.Claims(cl2)
if err != nil {
log.Errorf("Error parsing userinfo claims for provider %s: %v", provider.Name, err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if cl.Email == "" {
@ -187,7 +187,7 @@ func HandleCallback(c echo.Context) error {
if cl.Email == "" {
log.Errorf("Claim does not contain an email address for provider %s", provider.Name)
return handler.HandleHTTPError(&user.ErrNoOpenIDEmailProvided{}, c)
return handler.HandleHTTPError(&user.ErrNoOpenIDEmailProvided{})
}
}
@ -199,7 +199,7 @@ func HandleCallback(c echo.Context) error {
if err != nil {
_ = s.Rollback()
log.Errorf("Error creating new user for provider %s: %v", provider.Name, err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// does the oidc token contain well formed "vikunja_groups" through vikunja_scope
@ -229,7 +229,7 @@ func HandleCallback(c echo.Context) error {
if err != nil {
_ = s.Rollback()
log.Errorf("Error creating new team for provider %s: %v", provider.Name, err)
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Create token
return auth.NewUserAuthTokenResponse(u, c, false)

24
pkg/modules/background/handler/background.go
View File

@ -129,7 +129,7 @@ func (bp *BackgroundProvider) SetBackground(c echo.Context) error {
project, auth, err := bp.setBackgroundPreparations(s, c)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
p := bp.Provider()
@ -144,13 +144,13 @@ func (bp *BackgroundProvider) SetBackground(c echo.Context) error {
err = p.Set(s, image, project, auth)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
err = project.ReadOne(s, auth)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusOK, project)
@ -176,7 +176,7 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
project, auth, err := bp.setBackgroundPreparations(s, c)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Get + upload the image
@ -196,7 +196,7 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
mime, err := mimetype.DetectReader(srcf)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if !strings.HasPrefix(mime.String(), "image") {
_ = s.Rollback()
@ -210,18 +210,18 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
return echo.ErrBadRequest
}
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
err = project.ReadOne(s, auth)
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if err := s.Commit(); err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusOK, project)
@ -287,7 +287,7 @@ func checkProjectBackgroundRights(s *xorm.Session, c echo.Context) (project *mod
can, _, err := project.CanRead(s, auth)
if err != nil {
_ = s.Rollback()
return nil, auth, handler.HandleHTTPError(err, c)
return nil, auth, handler.HandleHTTPError(err)
}
if !can {
_ = s.Rollback()
@ -332,12 +332,12 @@ func GetProjectBackground(c echo.Context) error {
}
if err := bgFile.LoadFileByID(); err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
stat, err := bgFile.File.Stat()
if err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Unsplash requires pingbacks as per their api usage guidelines.
@ -347,7 +347,7 @@ func GetProjectBackground(c echo.Context) error {
if err := s.Commit(); err != nil {
_ = s.Rollback()
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Set Last-Modified header if we have the file stat, so clients can decide whether to use cached files

4
pkg/modules/background/unsplash/proxy.go
View File

@ -56,7 +56,7 @@ func unsplashImage(url string, c echo.Context) error {
func ProxyUnsplashImage(c echo.Context) error {
photo, err := getUnsplashPhotoInfoByID(c.Param("image"))
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
pingbackByPhotoID(photo.ID)
return unsplashImage(photo.Urls.Raw, c)
@ -76,7 +76,7 @@ func ProxyUnsplashImage(c echo.Context) error {
func ProxyUnsplashThumb(c echo.Context) error {
photo, err := getUnsplashPhotoInfoByID(c.Param("image"))
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
pingbackByPhotoID(photo.ID)
return unsplashImage("https://images.unsplash.com/"+getImageID(photo.Urls.Raw)+"?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjcyODAwfQ", c)

4
pkg/modules/migration/handler/common.go
View File

@ -28,12 +28,12 @@ import (
func status(ms migration.MigratorName, c echo.Context) error {
user, err := user2.GetCurrentUser(c)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
status, err := migration.GetMigrationStatus(ms, user)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusOK, status)

6
pkg/modules/migration/handler/handler.go
View File

@ -65,12 +65,12 @@ func (mw *MigrationWeb) Migrate(c echo.Context) error {
// Get the user from context
user, err := user2.GetCurrentUser(c)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
stats, err := migration.GetMigrationStatus(ms, user)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
if !stats.StartedAt.IsZero() && stats.FinishedAt.IsZero() {
@ -92,7 +92,7 @@ func (mw *MigrationWeb) Migrate(c echo.Context) error {
User: user,
})
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusOK, models.Message{Message: "Migration was started successfully."})

8
pkg/modules/migration/handler/handler_file.go
View File

@ -44,7 +44,7 @@ func (fw *FileMigratorWeb) Migrate(c echo.Context) error {
// Get the user from context
user, err := user2.GetCurrentUser(c)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
file, err := c.FormFile("import")
@ -59,18 +59,18 @@ func (fw *FileMigratorWeb) Migrate(c echo.Context) error {
m, err := migration.StartMigration(ms, user)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
// Do the migration
err = ms.Migrate(user, src, file.Size)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
err = migration.FinishMigration(m)
if err != nil {
return handler.HandleHTTPError(err, c)
return handler.HandleHTTPError(err)
}
return c.JSON(http.StatusOK, models.Message{Message: "Everything was migrated successfully."})