ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-06-18 10:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wrong chi version

Browse Source
This commit is contained in:
Jamie Curnow
2023-05-26 19:48:09 +10:00
parent e6ae25d081
commit e61cf52a65
5 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/internal/api/handler/helpers.go
View File

@ -8,7 +8,7 @@ import (
"npm/internal/api/context"
"npm/internal/model"
"github.com/go-chi/chi"
"github.com/go-chi/chi/v5"
"github.com/rotisserie/eris"
)
@ -112,7 +112,6 @@ func getURLParamInt(r *http.Request, varName string) (uint, error) {
return defaultValue, nil
}
// func ParseUint(s string, base int, bitSize int) (n uint64, err error)
paramUint, err := strconv.ParseUint(paramStr, 10, 32)
if err != nil {
return 0, eris.Wrapf(err, "%v is not a valid number", varName)

2
backend/internal/api/handler/settings.go
View File

@ -11,7 +11,7 @@ import (
"npm/internal/api/middleware"
"npm/internal/entity/setting"
"github.com/go-chi/chi"
"github.com/go-chi/chi/v5"
)
// GetSettings will return a list of Settings

2
backend/internal/api/handler/users.go
View File

@ -14,7 +14,7 @@ import (
"npm/internal/errors"
"npm/internal/logger"
"github.com/go-chi/chi"
"github.com/go-chi/chi/v5"
)
// GetUsers returns all users

20
backend/internal/api/router.go
View File

@ -85,11 +85,11 @@ func applyRoutes(r chi.Router) chi.Router {
r.With(middleware.EnforceSetup(true)).Route("/", func(r chi.Router) {
// Get yourself, requires a login but no other permissions
r.With(middleware.Enforce("")).
Get("/{userID:(?:me)}", handler.GetUser())
Get("/{userID:me}", handler.GetUser())
// Update yourself, requires a login but no other permissions
r.With(middleware.Enforce(""), middleware.EnforceRequestSchema(schema.UpdateUser())).
Put("/{userID:(?:me)}", handler.UpdateUser())
Put("/{userID:me}", handler.UpdateUser())
r.With(middleware.Enforce(user.CapabilityUsersManage)).Route("/", func(r chi.Router) {
// List
@ -98,19 +98,19 @@ func applyRoutes(r chi.Router) chi.Router {
Get("/", handler.GetUsers())
// Specific Item
r.Get("/{userID:(?:[0-9]+)}", handler.GetUser())
r.Delete("/{userID:(?:[0-9]+|me)}", handler.DeleteUser())
r.Get("/{userID:[0-9]+}", handler.GetUser())
r.Delete("/{userID:([0-9]+|me)}", handler.DeleteUser())
// Update another user
r.With(middleware.EnforceRequestSchema(schema.UpdateUser())).
Put("/{userID:(?:[0-9]+)}", handler.UpdateUser())
Put("/{userID:[0-9]+}", handler.UpdateUser())
})
// Auth - sets passwords
r.With(middleware.Enforce(""), middleware.EnforceRequestSchema(schema.SetAuth())).
Post("/{userID:(?:me)}/auth", handler.SetAuth())
Post("/{userID:me}/auth", handler.SetAuth())
r.With(middleware.Enforce(user.CapabilityUsersManage), middleware.EnforceRequestSchema(schema.SetAuth())).
Post("/{userID:(?:[0-9]+)}/auth", handler.SetAuth())
Post("/{userID:[0-9]+}/auth", handler.SetAuth())
})
})
@ -200,6 +200,12 @@ func applyRoutes(r chi.Router) chi.Router {
r.Route("/{caID:[0-9]+}", func(r chi.Router) {
r.With(middleware.Enforce(user.CapabilityCertificateAuthoritiesView)).
Get("/", handler.GetCertificateAuthority())
r.With(middleware.EnforceRequestSchema(schema.UpdateCertificateAuthority())).
Put("/", handler.UpdateCertificateAuthority())
r.With(middleware.Enforce(user.CapabilityCertificateAuthoritiesManage)).
Delete("/", handler.DeleteCertificateAuthority())
r.With(middleware.Enforce(user.CapabilityCertificateAuthoritiesManage)).Route("/", func(r chi.Router) {
r.Delete("/{caID:[0-9]+}", handler.DeleteCertificateAuthority())
r.With(middleware.EnforceRequestSchema(schema.UpdateCertificateAuthority())).