diff --git a/web/controller/api.go b/web/controller/api.go index dd548c65..0a078a84 100644 --- a/web/controller/api.go +++ b/web/controller/api.go @@ -21,10 +21,10 @@ func NewAPIController(g *gin.RouterGroup) *APIController { } func (controller *APIController) initRouter(router *gin.RouterGroup) { - apiV1 := router.Group("/panel/api") - apiV1.Use(controller.checkLogin) + apiV1 := router.Group("/panel/api") + apiV1.Use(controller.checkLogin) - inboundsApiGroup := apiV1.Group("/inbounds") + inboundsApiGroup := apiV1.Group("/inbounds") controller.inbounds = NewInboundController(inboundsApiGroup) inboundRoutes := []struct { @@ -69,8 +69,8 @@ func (controller *APIController) initApiV2Router(router *gin.RouterGroup) { serverApiGroup := apiV2.Group("/server") inboundsApiGroup := apiV2.Group("/inbounds") - controller.inbounds = NewInboundController(inboundsApiGroup) - controller.server = NewServerController(serverApiGroup) + controller.inbounds = NewInboundController(inboundsApiGroup) + controller.server = NewServerController(serverApiGroup) /** * Inbounds diff --git a/web/controller/base.go b/web/controller/base.go index 264a8f2d..c2975c7c 100644 --- a/web/controller/base.go +++ b/web/controller/base.go @@ -42,14 +42,14 @@ func I18nWeb(c *gin.Context, name string, params ...string) string { } func (a *BaseController) apiTokenGuard(c *gin.Context) { - bearerToken := c.Request.Header.Get("Authorization") - tokenParts := strings.Split(bearerToken, " ") - if len(tokenParts) != 2 { + bearerToken := c.Request.Header.Get("Authorization") + tokenParts := strings.Split(bearerToken, " ") + if len(tokenParts) != 2 { pureJsonMsg(c, http.StatusUnauthorized, false, "Invalid token format") - c.Abort() - return - } - reqToken := tokenParts[1] + c.Abort() + return + } + reqToken := tokenParts[1] token, err := a.settingService.GetApiToken() if err != nil { @@ -59,7 +59,7 @@ func (a *BaseController) apiTokenGuard(c *gin.Context) { } if reqToken != token { - pureJsonMsg(c, http.StatusUnauthorized, false, "Auth failed") + pureJsonMsg(c, http.StatusUnauthorized, false, "Auth failed") c.Abort() return } @@ -72,7 +72,7 @@ func (a *BaseController) apiTokenGuard(c *gin.Context) { session.SetSessionUser(c, user) - c.Next() + c.Next() session.ClearSession(c) } \ No newline at end of file diff --git a/web/controller/setting.go b/web/controller/setting.go index 57e6c6dd..f488a16c 100644 --- a/web/controller/setting.go +++ b/web/controller/setting.go @@ -150,20 +150,20 @@ func (a *SettingController) getDefaultXrayConfig(c *gin.Context) { } func (a *SettingController) getApiToken(c *gin.Context) { - response := &ApiTokenResponse{} + response := &ApiTokenResponse{} token, err := a.settingService.GetApiToken() if err != nil { - jsonObj(c, response , err) - return + jsonObj(c, response , err) + return } response.Token = token - jsonObj(c, response , nil) + jsonObj(c, response , nil) } func (a *SettingController) generateApiToken(c *gin.Context) { - response := &ApiTokenResponse{} + response := &ApiTokenResponse{} randomBytes := make([]byte, 32) _, err := rand.Read(randomBytes)