feat(system): Optimize the logic of the login page (#7828)

Author: zhengkunwang223

core/app/api/v2/app_launcher.go

@@ -18,7 +18,7 @@ func (b *BaseApi) SearchAppLauncher(c *gin.Context) {
 // @Tags App Launcher
 // @Summary Update app Launcher
 // @Accept json
-// @Param request body dto.ChangeShow true "request"
+// @Param request body dto.SettingUpdate true "request"
 // @Success 200
 // @Security ApiKeyAuth
 // @Security Timestamp

core/app/api/v2/auth.go

@@ -6,7 +6,6 @@ import (
 	"github.com/1Panel-dev/1Panel/core/app/dto"
 	"github.com/1Panel-dev/1Panel/core/app/model"
 	"github.com/1Panel-dev/1Panel/core/constant"
-	"github.com/1Panel-dev/1Panel/core/global"
 	"github.com/1Panel-dev/1Panel/core/utils/captcha"
 	"github.com/gin-gonic/gin"
 )
@@ -119,24 +118,16 @@ func (b *BaseApi) GetResponsePage(c *gin.Context) {
 }
 
 // @Tags Auth
-// @Summary Check System isDemo
-// @Success 200 {boolean} demo
-// @Router /core/auth/demo [get]
-func (b *BaseApi) CheckIsDemo(c *gin.Context) {
-	helper.SuccessWithData(c, global.CONF.Base.IsDemo)
-}
-
-// @Tags Auth
-// @Summary Load System Language
-// @Success 200 {string} language
-// @Router /core/auth/language [get]
-func (b *BaseApi) GetLanguage(c *gin.Context) {
+// @Summary Get Setting For Login
+// @Success 200 {object} dto.SystemSetting
+// @Router /core/auth/setting [get]
+func (b *BaseApi) GetLoginSetting(c *gin.Context) {
 	settingInfo, err := settingService.GetSettingInfo()
 	if err != nil {
 		helper.InternalServer(c, err)
 		return
 	}
-	helper.SuccessWithData(c, settingInfo.Language)
+	helper.SuccessWithData(c, settingInfo)
 }
 
 func saveLoginLogs(c *gin.Context, err error) {
@@ -151,11 +142,3 @@ func saveLoginLogs(c *gin.Context, err error) {
 	logs.Agent = c.GetHeader("User-Agent")
 	_ = logService.CreateLoginLog(logs)
 }
-
-// @Tags Auth
-// @Summary Check System IsIntl
-// @Success 200 {string} intl
-// @Router /auth/intl [get]
-func (b *BaseApi) CheckIsIntl(c *gin.Context) {
-	helper.SuccessWithData(c, global.CONF.Base.IsIntl)
-}

core/app/api/v2/backup.go

@@ -75,7 +75,7 @@ func (b *BaseApi) ListBuckets(c *gin.Context) {
 // @Tags Backup Account
 // @Summary Load backup account base info
 // @Accept json
-// @Success 200 {object} dto.OneDriveInfo
+// @Success 200 {object} dto.BackupClientInfo
 // @Security ApiKeyAuth
 // @Security Timestamp
 // @Router /core/backups/client/:clientType [get]

core/app/dto/auth.go

@@ -38,3 +38,9 @@ type MFALogin struct {
 	Code       string `json:"code" validate:"required"`
 	AuthMethod string `json:"authMethod"`
 }
+
+type SystemSetting struct {
+	IsDemo   bool   `json:"isDemo"`
+	Language string `json:"language"`
+	IsIntl   bool   `json:"isIntl"`
+}

core/app/service/auth.go

@@ -18,7 +18,6 @@ import (
 type AuthService struct{}
 
 type IAuthService interface {
-	CheckIsSafety(code string) (string, error)
 	GetResponsePage() (string, error)
 	VerifyCode(code string) (bool, error)
 	Login(c *gin.Context, info dto.Login, entrance string) (*dto.UserLoginInfo, string, error)
@@ -169,20 +168,6 @@ func (u *AuthService) VerifyCode(code string) (bool, error) {
 	return hmac.Equal([]byte(setting.Value), []byte(code)), nil
 }
 
-func (u *AuthService) CheckIsSafety(code string) (string, error) {
-	status, err := settingRepo.Get(repo.WithByKey("SecurityEntrance"))
-	if err != nil {
-		return "", err
-	}
-	if len(status.Value) == 0 {
-		return "disable", nil
-	}
-	if status.Value == code {
-		return "pass", nil
-	}
-	return "unpass", nil
-}
-
 func (u *AuthService) GetResponsePage() (string, error) {
 	pageCode, err := settingRepo.Get(repo.WithByKey("NoAuthSetting"))
 	if err != nil {

core/app/service/setting.go

@@ -47,8 +47,9 @@ type ISettingService interface {
 	UpdateTerminal(req dto.TerminalInfo) error
 
 	UpdateSystemSSL() error
-
 	GenerateRSAKey() error
+
+	GetLoginSetting() (*dto.SystemSetting, error)
 }
 
 func NewISettingService() ISettingService {
@@ -527,3 +528,16 @@ func (u *SettingService) GenerateRSAKey() error {
 	}
 	return nil
 }
+
+func (u *SettingService) GetLoginSetting() (*dto.SystemSetting, error) {
+	settingInfo, err := u.GetSettingInfo()
+	if err != nil {
+		return nil, err
+	}
+	res := &dto.SystemSetting{
+		Language: settingInfo.Language,
+		IsDemo:   global.CONF.Base.IsDemo,
+		IsIntl:   global.CONF.Base.IsIntl,
+	}
+	return res, nil
+}