MHSanaei/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-03-02 01:30:51 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #432 from hamid-gh98/main

Browse Source 
[HOTFIX] Add basePath to Redirect Middleware
This commit is contained in:
Ho3ein 2023-05-14 01:51:02 +03:30 committed by GitHub
commit 7b5dd2d0ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/web.go
View File

@ -147,16 +147,17 @@ func (s *Server) getHtmlTemplate(funcMap template.FuncMap) (*template.Template,
return t, nil return t, nil
} }
func redirectMiddleware() gin.HandlerFunc { func redirectMiddleware(basePath string) gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
// Redirect from old '/xui' path to '/panel' // Redirect from old '/xui' path to '/panel'
path := c.Request.URL.Path path := c.Request.URL.Path
redirects := map[string]string{ redirects := map[string]string{
"/panel/API": "/panel/api", "panel/API": "panel/api",
"/xui/API": "/panel/api", "xui/API": "panel/api",
"/xui": "/panel", "xui": "panel",
} }
for from, to := range redirects { for from, to := range redirects {
from, to = basePath+from, basePath+to
if strings.HasPrefix(path, from) { if strings.HasPrefix(path, from) {
newPath := to + path[len(from):] newPath := to + path[len(from):]
c.Redirect(http.StatusMovedPermanently, newPath) c.Redirect(http.StatusMovedPermanently, newPath)
@ -225,7 +226,7 @@ func (s *Server) initRouter() (*gin.Engine, error) {
} }
// Apply the redirect middleware (`/xui` to `/panel`) // Apply the redirect middleware (`/xui` to `/panel`)
engine.Use(redirectMiddleware()) engine.Use(redirectMiddleware(basePath))
g := engine.Group(basePath) g := engine.Group(basePath)