chore(web): move web handler package to Vikunja

(cherry picked from commit 2063da9eecf8d0980a62106a627d7f00da172138)

pkg/files/files.go

@@ -29,7 +29,7 @@ import (
 	"code.vikunja.io/api/pkg/metrics"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"github.com/c2h5oh/datasize"
 	"github.com/spf13/afero"
 	"xorm.io/xorm"

pkg/integrations/_test.go.tpl

@@ -18,7 +18,8 @@ package integrations
 
 import (
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
+
 	"github.com/labstack/echo"
 	"github.com/stretchr/testify/assert"
 	"net/url"

pkg/integrations/archived_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

pkg/integrations/integrations.go

@@ -35,8 +35,8 @@ import (
 	"code.vikunja.io/api/pkg/routes"
 	"code.vikunja.io/api/pkg/routes/caldav"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"

pkg/integrations/kanban_test.go

@@ -21,7 +21,7 @@ import (
 
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"

pkg/integrations/link_sharing_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"

pkg/integrations/project_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"

pkg/integrations/task_collection_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

pkg/integrations/task_comment_test.go

@@ -21,7 +21,7 @@ import (
 
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"

pkg/integrations/task_test.go

@@ -21,7 +21,7 @@ import (
 
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"

pkg/metrics/active_users.go

@@ -22,7 +22,7 @@ import (
 
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 )

pkg/models/api_tokens.go

@@ -27,7 +27,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/utils"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"golang.org/x/crypto/pbkdf2"
 	"xorm.io/xorm"
 )

pkg/models/api_tokens_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/bulk_task.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"dario.cat/mergo"
 	"xorm.io/xorm"

pkg/models/error.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 // Generic

pkg/models/events.go

@@ -18,7 +18,7 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 /////////////////

pkg/models/favorites.go

@@ -18,7 +18,7 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )

pkg/models/kanban.go

@@ -23,7 +23,7 @@ import (
 
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/kanban_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/kanban_task_bucket.go

@@ -21,7 +21,7 @@ import (
 
 	"code.vikunja.io/api/pkg/events"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/label.go

@@ -22,7 +22,7 @@ import (
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/label_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )

pkg/models/label_task.go

@@ -24,7 +24,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"xorm.io/builder"
 	"xorm.io/xorm"

pkg/models/label_task_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/label_task_test.go

@@ -26,7 +26,7 @@ import (
 	"code.vikunja.io/api/pkg/user"
 	"gopkg.in/d4l3k/messagediff.v1"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 func TestLabelTask_ReadAll(t *testing.T) {

pkg/models/label_test.go

@@ -26,7 +26,7 @@ import (
 	"code.vikunja.io/api/pkg/user"
 	"gopkg.in/d4l3k/messagediff.v1"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 func TestLabel_ReadAll(t *testing.T) {

pkg/models/link_sharing.go

@@ -25,7 +25,7 @@ import (
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"github.com/golang-jwt/jwt/v5"
 	"golang.org/x/crypto/bcrypt"
 	"xorm.io/builder"

pkg/models/link_sharing_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/notifications_database.go

@@ -18,7 +18,7 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/notifications"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/project.go

@@ -30,7 +30,7 @@ import (
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )

pkg/models/project_duplicate.go

@@ -20,7 +20,7 @@ import (
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/utils"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/project_rights.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )

pkg/models/project_team.go

@@ -23,7 +23,7 @@ import (
 
 	"code.vikunja.io/api/pkg/events"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/project_team_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/project_team_test.go

@@ -24,7 +24,7 @@ import (
 
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

pkg/models/project_users.go

@@ -24,7 +24,7 @@ import (
 	"code.vikunja.io/api/pkg/events"
 
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/project_users_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/project_users_rights_test.go

@@ -23,7 +23,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 func TestProjectUser_CanDoSomething(t *testing.T) {

pkg/models/project_users_test.go

@@ -24,7 +24,7 @@ import (
 
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"github.com/stretchr/testify/require"
 	"gopkg.in/d4l3k/messagediff.v1"

pkg/models/project_view.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/project_view_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/reaction.go

@@ -19,7 +19,7 @@ package models
 import (
 	"time"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 

pkg/models/reaction_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/saved_filters.go

@@ -22,7 +22,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/user"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )

pkg/models/saved_filters_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/subscription.go

@@ -22,7 +22,7 @@ import (
 	"xorm.io/builder"
 
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/subscription_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_assignees.go

@@ -26,7 +26,7 @@ import (
 	"code.vikunja.io/api/pkg/events"
 
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_assignees_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_attachment.go

@@ -24,7 +24,7 @@ import (
 
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_attachment_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_collection.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"xorm.io/xorm"
 )

pkg/models/task_collection_test.go

@@ -25,7 +25,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"gopkg.in/d4l3k/messagediff.v1"
 )
 

pkg/models/task_comment_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_comments.go

@@ -23,7 +23,7 @@ import (
 
 	"code.vikunja.io/api/pkg/events"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"xorm.io/builder"
 	"xorm.io/xorm"

pkg/models/task_position.go

@@ -20,7 +20,7 @@ import (
 	"math"
 
 	"code.vikunja.io/api/pkg/events"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_relation.go

@@ -25,7 +25,7 @@ import (
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 // RelationKind represents a kind of relation between to tasks

pkg/models/task_relation_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/task_search.go

@@ -24,7 +24,7 @@ import (
 
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"github.com/typesense/typesense-go/typesense/api"
 	"github.com/typesense/typesense-go/typesense/api/pointer"
 

pkg/models/tasks.go

@@ -30,7 +30,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"dario.cat/mergo"
 	"github.com/google/uuid"

pkg/models/tasks_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/team_members.go

@@ -19,7 +19,7 @@ package models
 import (
 	"code.vikunja.io/api/pkg/events"
 	user2 "code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/team_members_rights.go

@@ -18,7 +18,7 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/teams.go

@@ -24,7 +24,7 @@ import (
 
 	"code.vikunja.io/api/pkg/events"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"xorm.io/builder"
 	"xorm.io/xorm"

pkg/models/teams_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/teams_rights_test.go

@@ -23,7 +23,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 func TestTeam_CanDoSomething(t *testing.T) {

pkg/models/users.go

@@ -18,7 +18,7 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/webhooks.go

@@ -37,7 +37,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/version"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/models/webhooks_rights.go

@@ -17,7 +17,7 @@
 package models
 
 import (
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/modules/auth/auth.go

@@ -26,7 +26,7 @@ import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"

pkg/modules/auth/openid/openid.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"

pkg/modules/background/background.go

@@ -18,7 +18,7 @@ package background
 
 import (
 	"code.vikunja.io/api/pkg/models"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"xorm.io/xorm"
 )
 

pkg/modules/background/handler/background.go

@@ -42,8 +42,8 @@ import (
 	"code.vikunja.io/api/pkg/modules/background"
 	"code.vikunja.io/api/pkg/modules/background/unsplash"
 	"code.vikunja.io/api/pkg/modules/background/upload"
-	"code.vikunja.io/web"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/bbrks/go-blurhash"
 	"github.com/gabriel-vasile/mimetype"

pkg/modules/background/unsplash/proxy.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"
 
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/modules/background/unsplash/unsplash.go

@@ -34,7 +34,7 @@ import (
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/background"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 const (

pkg/modules/background/upload/upload.go

@@ -24,7 +24,7 @@ import (
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/background"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 // Provider represents an upload provider

pkg/modules/migration/handler/common.go

@@ -21,7 +21,7 @@ import (
 
 	"code.vikunja.io/api/pkg/modules/migration"
 	user2 "code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/modules/migration/handler/handler.go

@@ -23,7 +23,7 @@ import (
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/migration"
 	user2 "code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/modules/migration/handler/handler_file.go

@@ -22,7 +22,7 @@ import (
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/migration"
 	user2 "code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/avatar.go

@@ -29,7 +29,7 @@ import (
 	"code.vikunja.io/api/pkg/modules/avatar/marble"
 	"code.vikunja.io/api/pkg/modules/avatar/upload"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"bytes"
 	"image"

pkg/routes/api/v1/link_sharing_auth.go

@@ -23,7 +23,7 @@ import (
 
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/auth"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/login.go

@@ -25,7 +25,7 @@ import (
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/auth"
 	user2 "code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"

pkg/routes/api/v1/task_attachment.go

@@ -23,7 +23,8 @@ import (
 
 	"code.vikunja.io/api/pkg/models"
 	auth2 "code.vikunja.io/api/pkg/modules/auth"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
+
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_caldav_token.go

@@ -23,7 +23,7 @@ import (
 	"code.vikunja.io/api/pkg/models"
 
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_confirm_email.go

@@ -23,7 +23,7 @@ import (
 
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_deletion.go

@@ -22,7 +22,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/labstack/echo/v4"
 )

pkg/routes/api/v1/user_export.go

@@ -24,7 +24,7 @@ import (
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 	"xorm.io/xorm"
 )

pkg/routes/api/v1/user_list.go

@@ -25,7 +25,7 @@ import (
 	"code.vikunja.io/api/pkg/models"
 	auth2 "code.vikunja.io/api/pkg/modules/auth"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_password_reset.go

@@ -23,7 +23,7 @@ import (
 
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_register.go

@@ -25,7 +25,7 @@ import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_settings.go

@@ -27,7 +27,7 @@ import (
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/models"
 	user2 "code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 )
 
 // UserAvatarProvider holds the user avatar provider type

pkg/routes/api/v1/user_show.go

@@ -27,7 +27,7 @@ import (
 
 	"code.vikunja.io/api/pkg/db"
 
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_totp.go

@@ -28,7 +28,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_update_email.go

@@ -26,7 +26,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/api/v1/user_update_password.go

@@ -23,7 +23,7 @@ import (
 
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 )
 

pkg/routes/caldav/handler.go

@@ -28,7 +28,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web/handler"
 	"github.com/labstack/echo/v4"
 	"github.com/samedi/caldav-go"
 	"github.com/samedi/caldav-go/lib"

pkg/routes/caldav/listStorageProvider.go

@@ -27,7 +27,7 @@ import (
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	user2 "code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"github.com/samedi/caldav-go/data"
 	"github.com/samedi/caldav-go/errs"
 	"xorm.io/xorm"

pkg/routes/routes.go

@@ -77,8 +77,8 @@ 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/web"
-	"code.vikunja.io/web/handler"
+	"code.vikunja.io/api/pkg/web"
+	"code.vikunja.io/api/pkg/web/handler"
 
 	"github.com/getsentry/sentry-go"
 	sentryecho "github.com/getsentry/sentry-go/echo"

pkg/user/error.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 )
 
 // =====================

pkg/user/user.go

@@ -30,7 +30,7 @@ import (
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	"code.vikunja.io/api/pkg/notifications"
 
-	"code.vikunja.io/web"
+	"code.vikunja.io/api/pkg/web"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
 	"golang.org/x/crypto/bcrypt"