mirror of
https://github.com/h44z/wg-portal.git
synced 2025-11-09 10:36:17 +00:00
fix path parameter handling in REST api (#563)
This commit is contained in:
@@ -48,12 +48,12 @@ func (e InterfaceEndpoint) RegisterRoutes(g *routegroup.Bundle) {
|
|||||||
apiGroup.Use(e.authenticator.LoggedIn(ScopeAdmin))
|
apiGroup.Use(e.authenticator.LoggedIn(ScopeAdmin))
|
||||||
|
|
||||||
apiGroup.HandleFunc("GET /all", e.handleAllGet())
|
apiGroup.HandleFunc("GET /all", e.handleAllGet())
|
||||||
apiGroup.HandleFunc("GET /by-id/{id}", e.handleByIdGet())
|
apiGroup.HandleFunc("GET /by-id/{id...}", e.handleByIdGet())
|
||||||
|
|
||||||
apiGroup.HandleFunc("GET /prepare", e.handlePrepareGet())
|
apiGroup.HandleFunc("GET /prepare", e.handlePrepareGet())
|
||||||
apiGroup.HandleFunc("POST /new", e.handleCreatePost())
|
apiGroup.HandleFunc("POST /new", e.handleCreatePost())
|
||||||
apiGroup.HandleFunc("PUT /by-id/{id}", e.handleUpdatePut())
|
apiGroup.HandleFunc("PUT /by-id/{id...}", e.handleUpdatePut())
|
||||||
apiGroup.HandleFunc("DELETE /by-id/{id}", e.handleDelete())
|
apiGroup.HandleFunc("DELETE /by-id/{id...}", e.handleDelete())
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleAllGet returns a gorm Handler function.
|
// handleAllGet returns a gorm Handler function.
|
||||||
|
|||||||
@@ -44,10 +44,10 @@ func (e MetricsEndpoint) RegisterRoutes(g *routegroup.Bundle) {
|
|||||||
apiGroup := g.Mount("/metrics")
|
apiGroup := g.Mount("/metrics")
|
||||||
apiGroup.Use(e.authenticator.LoggedIn())
|
apiGroup.Use(e.authenticator.LoggedIn())
|
||||||
|
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /by-interface/{id}",
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /by-interface/{id...}",
|
||||||
e.handleMetricsForInterfaceGet())
|
e.handleMetricsForInterfaceGet())
|
||||||
apiGroup.HandleFunc("GET /by-user/{id}", e.handleMetricsForUserGet())
|
apiGroup.HandleFunc("GET /by-user/{id...}", e.handleMetricsForUserGet())
|
||||||
apiGroup.HandleFunc("GET /by-peer/{id}", e.handleMetricsForPeerGet())
|
apiGroup.HandleFunc("GET /by-peer/{id...}", e.handleMetricsForPeerGet())
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleMetricsForInterfaceGet returns a gorm Handler function.
|
// handleMetricsForInterfaceGet returns a gorm Handler function.
|
||||||
|
|||||||
@@ -47,15 +47,15 @@ func (e PeerEndpoint) RegisterRoutes(g *routegroup.Bundle) {
|
|||||||
apiGroup := g.Mount("/peer")
|
apiGroup := g.Mount("/peer")
|
||||||
apiGroup.Use(e.authenticator.LoggedIn())
|
apiGroup.Use(e.authenticator.LoggedIn())
|
||||||
|
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /by-interface/{id}",
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /by-interface/{id...}",
|
||||||
e.handleAllForInterfaceGet())
|
e.handleAllForInterfaceGet())
|
||||||
apiGroup.HandleFunc("GET /by-user/{id}", e.handleAllForUserGet())
|
apiGroup.HandleFunc("GET /by-user/{id...}", e.handleAllForUserGet())
|
||||||
apiGroup.HandleFunc("GET /by-id/{id}", e.handleByIdGet())
|
apiGroup.HandleFunc("GET /by-id/{id...}", e.handleByIdGet())
|
||||||
|
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /prepare/{id}", e.handlePrepareGet())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /prepare/{id...}", e.handlePrepareGet())
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("POST /new", e.handleCreatePost())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("POST /new", e.handleCreatePost())
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("PUT /by-id/{id}", e.handleUpdatePut())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("PUT /by-id/{id...}", e.handleUpdatePut())
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("DELETE /by-id/{id}", e.handleDelete())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("DELETE /by-id/{id...}", e.handleDelete())
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleAllForInterfaceGet returns a gorm Handler function.
|
// handleAllForInterfaceGet returns a gorm Handler function.
|
||||||
|
|||||||
@@ -47,10 +47,10 @@ func (e UserEndpoint) RegisterRoutes(g *routegroup.Bundle) {
|
|||||||
apiGroup.Use(e.authenticator.LoggedIn())
|
apiGroup.Use(e.authenticator.LoggedIn())
|
||||||
|
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /all", e.handleAllGet())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("GET /all", e.handleAllGet())
|
||||||
apiGroup.HandleFunc("GET /by-id/{id}", e.handleByIdGet())
|
apiGroup.HandleFunc("GET /by-id/{id...}", e.handleByIdGet())
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("POST /new", e.handleCreatePost())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("POST /new", e.handleCreatePost())
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("PUT /by-id/{id}", e.handleUpdatePut())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("PUT /by-id/{id...}", e.handleUpdatePut())
|
||||||
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("DELETE /by-id/{id}", e.handleDelete())
|
apiGroup.With(e.authenticator.LoggedIn(ScopeAdmin)).HandleFunc("DELETE /by-id/{id...}", e.handleDelete())
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleAllGet returns a gorm Handler function.
|
// handleAllGet returns a gorm Handler function.
|
||||||
|
|||||||
Reference in New Issue
Block a user