fix: update login license redirect

Author: ssongliu

core/app/api/v2/auth.go

@@ -461,6 +461,28 @@ func (b *BaseApi) UpdateCurrentUser(c *gin.Context) {
 	helper.Success(c)
 }
 
+// @Tags Auth
+// @Summary Reset system password expired
+// @Accept json
+// @Param request body dto.PasswordUpdate true "request"
+// @Success 200
+// @Security ApiKeyAuth
+// @Security Timestamp
+// @Router /core/auth/expired/reset [post]
+// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重置过期密码","formatEN":"reset an expired Password"}
+func (b *BaseApi) ResetPassword(c *gin.Context) {
+	var req dto.PasswordUpdate
+	if err := helper.CheckBindAndValidate(&req, c); err != nil {
+		return
+	}
+
+	if err := xpack.AuthProvider.HandlePasswordExpired(c, req.OldPassword, req.NewPassword); err != nil {
+		helper.InternalServer(c, err)
+		return
+	}
+	helper.Success(c)
+}
+
 func saveLoginLogs(c *gin.Context, err error) {
 	var logs model.LoginLog
 	if err != nil {

core/app/api/v2/setting.go

@@ -17,7 +17,6 @@ import (
 	"github.com/1Panel-dev/1Panel/core/constant"
 	"github.com/1Panel-dev/1Panel/core/global"
 	"github.com/1Panel-dev/1Panel/core/utils/common"
-	"github.com/1Panel-dev/1Panel/core/utils/xpack"
 	"github.com/gin-gonic/gin"
 )
 
@@ -338,28 +337,6 @@ func (b *BaseApi) UpdatePort(c *gin.Context) {
 	helper.Success(c)
 }
 
-// @Tags System Setting
-// @Summary Reset system password expired
-// @Accept json
-// @Param request body dto.PasswordUpdate true "request"
-// @Success 200
-// @Security ApiKeyAuth
-// @Security Timestamp
-// @Router /core/settings/expired/handle [post]
-// @x-panel-log {"bodyKeys":[],"paramKeys":[],"BeforeFunctions":[],"formatZH":"重置过期密码","formatEN":"reset an expired Password"}
-func (b *BaseApi) HandlePasswordExpired(c *gin.Context) {
-	var req dto.PasswordUpdate
-	if err := helper.CheckBindAndValidate(&req, c); err != nil {
-		return
-	}
-
-	if err := xpack.AuthProvider.HandlePasswordExpired(c, req.OldPassword, req.NewPassword); err != nil {
-		helper.InternalServer(c, err)
-		return
-	}
-	helper.Success(c)
-}
-
 func (b *BaseApi) ReloadSSL(c *gin.Context) {
 	clientIP := c.ClientIP()
 	if clientIP != "127.0.0.1" {

core/app/service/logs.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"net/http"
+	"os"
 
 	"github.com/1Panel-dev/1Panel/core/buserr"
 	"github.com/1Panel-dev/1Panel/core/constant"
@@ -126,7 +127,7 @@ func runRemoteShellScript(url string, args ...string) error {
 	if statusCode < http.StatusOK || statusCode >= http.StatusMultipleChoices {
 		return fmt.Errorf("download script failed, status code: %d", statusCode)
 	}
-	_, err = cmd.NewCommandMgr().RunPipe(cmd.PipeCommand{
+	_, err = cmd.NewCommandMgr(cmd.WithOutputFile(os.DevNull)).RunPipe(cmd.PipeCommand{
 		Name:  "sh",
 		Args:  append([]string{"-s"}, args...),
 		Stdin: bytes.NewReader(script),

core/cmd/server/conf/app.yaml

@@ -4,7 +4,7 @@ base:
   is_demo: false
   is_offline: false
   is_fxplay: false
-  is_xpackee: false
+  is_xpackee: true
   port: 9999
   username: admin
   password: admin123

core/middleware/password_expired.go

@@ -16,9 +16,11 @@ import (
 func PasswordExpired() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		if strings.HasPrefix(c.Request.URL.Path, "/api/v2/core/auth") ||
-			c.Request.URL.Path == "/api/v2/core/settings/expired/handle" ||
 			c.Request.URL.Path == "/api/v2/core/settings/search" ||
-			c.Request.URL.Path == "/api/v2/core/settings/search/base" {
+			c.Request.URL.Path == "/api/v2/core/settings/search/base" ||
+			c.Request.URL.Path == "/api/v2/core/xpackee/licenses/info" ||
+			c.Request.URL.Path == "/api/v2/core/xpackee/licenses/status" ||
+			c.Request.URL.Path == "/api/v2/core/xpackee/licenses/upload" {
 			c.Next()
 			return
 		}

core/router/ro_base.go

@@ -26,14 +26,17 @@ func (s *BaseRouter) InitRouter(Router *gin.RouterGroup) {
 
 		authRouter.POST("/mfa", baseApi.LoadMFA)
 		authRouter.POST("/mfa/bind", baseApi.MFABind)
+
 		authRouter.POST("/passkey/register/begin", baseApi.PasskeyRegisterBegin)
 		authRouter.POST("/passkey/register/finish", baseApi.PasskeyRegisterFinish)
 		authRouter.GET("/passkey/list", baseApi.PasskeyList)
 		authRouter.POST("/passkey/del", baseApi.PasskeyDelete)
+
 		authRouter.POST("/api/generate", baseApi.GenerateApiKey)
 		authRouter.POST("/api/update", baseApi.UpdateApiConfig)
 
 		authRouter.GET("/current", baseApi.GetCurrentUser)
 		authRouter.POST("/current/update", baseApi.UpdateCurrentUser)
+		authRouter.POST("/expired/reset", baseApi.ResetPassword)
 	}
 }

core/router/ro_setting.go

@@ -18,10 +18,10 @@ func (s *SettingRouter) InitRouter(Router *gin.RouterGroup) {
 	noAuthRouter := Router.Group("settings")
 	baseApi := v2.ApiGroupApp.BaseApi
 	{
-		router.POST("/search", baseApi.GetSettingInfo)
 		router.POST("/search/base", baseApi.GetSettingBaseInfo)
 
 		settingRouter.POST("/by", baseApi.GetSettingByKey)
+		settingRouter.POST("/search", baseApi.GetSettingInfo)
 		settingRouter.POST("/terminal/search", baseApi.GetTerminalSettingInfo)
 		settingRouter.GET("/search/available", baseApi.GetSystemAvailable)
 		settingRouter.POST("/update", baseApi.UpdateSetting)

frontend/src/api/index.ts

@@ -95,7 +95,12 @@ class RequestHttp {
                 if (data.code == ResultEnum.ERRXPACKEE) {
                     globalStore.isXpackEELicensed = false;
                     const routeName = router.currentRoute.value.name;
-                    if (globalStore.isLogin && routeName !== 'entrance' && routeName !== 'login') {
+                    if (
+                        globalStore.isLogin &&
+                        routeName !== 'entrance' &&
+                        routeName !== 'login' &&
+                        routeName !== 'XpackEELicenseRequired'
+                    ) {
                         router.push({ name: 'XpackEELicenseRequired' });
                     }
                     return Promise.reject(data);

frontend/src/api/interface/auth.ts

@@ -90,4 +90,8 @@ export namespace Login {
         ipWhiteList: string;
         apiKeyValidityTime: string;
     }
+    export interface PasswordUpdate {
+        oldPassword: string;
+        newPassword: string;
+    }
 }

frontend/src/api/interface/setting.ts

@@ -152,10 +152,6 @@ export namespace Setting {
         key: string;
         sslID: number;
     }
-    export interface PasswordUpdate {
-        oldPassword: string;
-        newPassword: string;
-    }
     export interface PortUpdate {
         serverPort: number;
     }