colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#223] updated the internal redirects to allow easier subpath deployment when behind a reverse proxy

This commit is contained in:
Gani Georgiev 2023-02-24 18:49:46 +02:00
parent 4778fc7a46
commit 578e1c9bc1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -51,6 +51,8 @@
- **!** Removed the previously deprecated `Dao.Block()` and `Dao.Continue()` helpers in favor of `Dao.NonconcurrentDB()`. - **!** Removed the previously deprecated `Dao.Block()` and `Dao.Continue()` helpers in favor of `Dao.NonconcurrentDB()`.
- Updated the internal redirects to allow easier subpath deployment when behind a reverse proxy.
- Other minor Admin UI improvements. - Other minor Admin UI improvements.
## v0.12.3 ## v0.12.3

8
apis/base.go
View File

@ -163,7 +163,7 @@ func bindStaticAdminUI(app core.App, e *echo.Echo) error {
e.GET( e.GET(
strings.TrimRight(trailedAdminPath, "/"), strings.TrimRight(trailedAdminPath, "/"),
func(c echo.Context) error { func(c echo.Context) error {
return c.Redirect(http.StatusTemporaryRedirect, trailedAdminPath) return c.Redirect(http.StatusTemporaryRedirect, strings.TrimLeft(trailedAdminPath, "/"))
}, },
) )
@ -224,12 +224,12 @@ func installerRedirect(app core.App) echo.MiddlewareFunc {
if totalAdmins == 0 && !hasInstallerParam { if totalAdmins == 0 && !hasInstallerParam {
// redirect to the installer page // redirect to the installer page
return c.Redirect(http.StatusTemporaryRedirect, trailedAdminPath+"?installer#") return c.Redirect(http.StatusTemporaryRedirect, "?installer#")
} }
if totalAdmins != 0 && hasInstallerParam { if totalAdmins != 0 && hasInstallerParam {
// redirect to the home page // clear the installer param
return c.Redirect(http.StatusTemporaryRedirect, trailedAdminPath+"#/") return c.Redirect(http.StatusTemporaryRedirect, "?")
} }
return next(c) return next(c)