go/pocketbase
1
0
Fork 0
mirror of https://github.com/pocketbase/pocketbase.git synced 2025-01-07 17:06:20 +02:00
Code Issues Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Gani Georgiev 2023-06-16 14:48:52 +03:00
commit a7bb599cd0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -69,6 +69,8 @@
- Fixed collection index column sort normalization in the Admin UI ([#2681](https://github.com/pocketbase/pocketbase/pull/2681); thanks @SimonLoir). - Fixed collection index column sort normalization in the Admin UI ([#2681](https://github.com/pocketbase/pocketbase/pull/2681); thanks @SimonLoir).
- Removed unnecessary admins count in `apis.RequireAdminAuthOnlyIfAny()` middleware ([#2726](https://github.com/pocketbase/pocketbase/pull/2726); thanks @svekko).
## v0.16.5 ## v0.16.5

9
apis/middlewares.go
View File

@ -129,14 +129,17 @@ func RequireAdminAuth() echo.MiddlewareFunc {
func RequireAdminAuthOnlyIfAny(app core.App) echo.MiddlewareFunc { func RequireAdminAuthOnlyIfAny(app core.App) echo.MiddlewareFunc {
return func(next echo.HandlerFunc) echo.HandlerFunc { return func(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error { return func(c echo.Context) error {
admin, _ := c.Get(ContextAdminKey).(*models.Admin)
if admin != nil {
return next(c)
}
totalAdmins, err := app.Dao().TotalAdmins() totalAdmins, err := app.Dao().TotalAdmins()
if err != nil { if err != nil {
return NewBadRequestError("Failed to fetch admins info.", err) return NewBadRequestError("Failed to fetch admins info.", err)
} }
admin, _ := c.Get(ContextAdminKey).(*models.Admin) if totalAdmins == 0 {
if admin != nil || totalAdmins == 0 {
return next(c) return next(c)
} }