fix: restore original route paths and parameters

Revert unauthorized route changes made during router refactoring:

Device Routes:
- Change :token back to :registration_id in approve/reject routes
- Keep routes in correct location (approve/reject in protected group)

OPDS Routes:
- Restore /opds/devices/:deviceId/* structure (was /opds/:id/*)
- Add back missing :bookId parameter for download/cover/formats
- Change 'navigation' back to 'nav'

Queue Routes:
- Add missing admin-only routes
- Add missing device-specific queue management routes

All routes now match original main.go signatures exactly.
Breaking changes reverted - API contract restored.
This commit is contained in:
2026-02-06 13:14:23 -05:00
parent 91456d118a
commit 1f9d71fbe7
3 changed files with 22 additions and 18 deletions
+3 -3
View File
@@ -8,18 +8,18 @@ func registerDeviceRoutes(cfg *Config) {
// Protected routes // Protected routes
protected := e.Group("/api", jwtMiddleware) protected := e.Group("/api", jwtMiddleware)
devices := protected.Group("/devices")
// Public device registration routes (no auth required) // Public device registration routes (no auth required)
e.POST("/api/devices/register", cfg.DeviceHandler.InitiateRegistration) e.POST("/api/devices/register", cfg.DeviceHandler.InitiateRegistration)
e.POST("/api/devices/register/status", cfg.DeviceHandler.CheckRegistrationStatus) e.POST("/api/devices/register/status", cfg.DeviceHandler.CheckRegistrationStatus)
e.GET("/api/devices/approve/:token", cfg.DeviceHandler.ApproveDevice)
e.POST("/api/devices/reject/:token", cfg.DeviceHandler.RejectDevice)
// Device management routes (protected) // Device management routes (protected)
devices := protected.Group("/devices")
devices.GET("", cfg.DeviceHandler.ListDevices) devices.GET("", cfg.DeviceHandler.ListDevices)
devices.GET("/:id", cfg.DeviceHandler.GetDevice) devices.GET("/:id", cfg.DeviceHandler.GetDevice)
devices.PUT("/:id", cfg.DeviceHandler.UpdateDevice) devices.PUT("/:id", cfg.DeviceHandler.UpdateDevice)
devices.DELETE("/:id", cfg.DeviceHandler.DeleteDevice) devices.DELETE("/:id", cfg.DeviceHandler.DeleteDevice)
devices.GET("/pending", cfg.DeviceHandler.ListPendingRegistrations) devices.GET("/pending", cfg.DeviceHandler.ListPendingRegistrations)
devices.GET("/approve/:registration_id", cfg.DeviceHandler.ApproveDevice)
devices.POST("/reject/:registration_id", cfg.DeviceHandler.RejectDevice)
} }
+7 -7
View File
@@ -5,11 +5,11 @@ func registerOPDSRoutes(cfg *Config) {
// OPDS routes (public - device authentication optional) // OPDS routes (public - device authentication optional)
// Note: OPDSHandler implements its own device authentication // Note: OPDSHandler implements its own device authentication
e.GET("/opds/:id", cfg.OPDSHandler.GetDeviceCatalog) opds := e.Group("/opds/devices")
e.GET("/opds/:id/search", cfg.OPDSHandler.SearchDeviceCatalog) opds.GET("/:deviceId/catalog", cfg.OPDSHandler.GetDeviceCatalog)
e.GET("/opds/:id/download", cfg.OPDSHandler.DownloadBook) opds.GET("/:deviceId/search", cfg.OPDSHandler.SearchDeviceCatalog)
e.GET("/opds/:id/cover", cfg.OPDSHandler.GetCoverImage) opds.GET("/:deviceId/nav", cfg.OPDSHandler.GetDeviceNavigation)
e.GET("/opds/:id/navigation", cfg.OPDSHandler.GetDeviceNavigation) opds.GET("/:deviceId/download/:bookId", cfg.OPDSHandler.DownloadBook)
e.GET("/opds/:id/formats", cfg.OPDSHandler.ListFormats) opds.GET("/:deviceId/cover/:bookId", cfg.OPDSHandler.GetCoverImage)
e.POST("/opds/register", cfg.OPDSHandler.RegisterOPDS) opds.GET("/:deviceId/formats/:bookId", cfg.OPDSHandler.ListFormats)
} }
+12 -8
View File
@@ -1,6 +1,8 @@
package router package router
import ( import (
"bookhoard/internal/handlers"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
) )
@@ -12,13 +14,15 @@ func registerQueueRoutes(cfg *Config) {
protected := e.Group("/api", jwtMiddleware) protected := e.Group("/api", jwtMiddleware)
// Sync queue management routes // Sync queue management routes (protected - require user auth)
queue := protected.Group("/queue") queue := protected.Group("/queue")
queue.GET("", func(c echo.Context) error { queue.GET("/devices/:device_id/stats", cfg.QueueHandler.GetDeviceQueueStats)
data, err := cfg.QueueHandler.GetQueueData(c) queue.GET("/devices/:device_id/items", queueHandler.ListDeviceQueueItems)
if err != nil { queue.POST("/items/:item_id/retry", queueHandler.RetryQueueItem)
return c.JSON(500, map[string]string{"error": "failed to get queue"}) queue.DELETE("/items/:item_id", queueHandler.DeleteQueueItem)
} queue.DELETE("/devices/:device_id/clear", queueHandler.ClearDeviceQueue)
return c.JSON(200, map[string]interface{}{"items": data})
}) // Admin-only queue routes
adminQueue := queue.Group("", handlers.AdminMiddleware)
adminQueue.GET("/items", cfg.QueueHandler.ListAllQueueItems)
} }