Refactor application.FailedSigninLimit code

controllers/application.go

@@ -110,14 +110,6 @@ func (c *ApiController) GetApplication() {
 		}
 	}
 
-	// 0 as an initialization value, corresponding to the default configuration parameters
-	if application.FailedSigninLimit == 0 {
-		application.FailedSigninLimit = object.DefaultFailedSigninLimit
-	}
-	if application.FailedSigninfrozenTime == 0 {
-		application.FailedSigninfrozenTime = object.DefaultFailedSigninfrozenTime
-	}
-
 	c.ResponseOk(object.GetMaskedApplication(application, userId))
 }
 

object/application.go

@@ -384,6 +384,13 @@ func GetMaskedApplication(application *Application, userId string) *Application
 		application.InvitationCodes = []string{"***"}
 	}
 
+	if application.FailedSigninLimit == 0 {
+		application.FailedSigninLimit = DefaultFailedSigninLimit
+	}
+	if application.FailedSigninfrozenTime == 0 {
+		application.FailedSigninfrozenTime = DefaultFailedSigninfrozenTime
+	}
+
 	return application
 }
 

object/check.go

@@ -28,8 +28,7 @@ import (
 )
 
 const (
-	DefaultFailedSigninLimit = 5
+	DefaultFailedSigninLimit      = 5
-	// DefaultFailedSigninfrozenTime The unit of frozen time is minutes
 	DefaultFailedSigninfrozenTime = 15
 )
 
@@ -509,12 +508,11 @@ func CheckToEnableCaptcha(application *Application, organization, username strin
 					return false, err
 				}
 
-				var failedSigninLimit int
+				failedSigninLimit := application.FailedSigninLimit
-				if application.FailedSigninLimit == 0 {
+				if failedSigninLimit == 0 {
-					failedSigninLimit = 5
+					failedSigninLimit = DefaultFailedSigninLimit
-				} else {
-					failedSigninLimit = application.FailedSigninLimit
 				}
+
 				return user != nil && user.SigninWrongTimes >= failedSigninLimit, nil
 			}
 			return providerItem.Rule == "Always", nil

object/check_util.go

@@ -52,13 +52,13 @@ func GetFailedSigninConfigByUser(user *User) (int, int, error) {
 	if err != nil {
 		return 0, 0, err
 	}
-	failedSigninLimit := application.FailedSigninLimit
-	failedSigninfrozenTime := application.FailedSigninfrozenTime
 
-	// 0 as an initialization value, corresponding to the default configuration parameters
+	failedSigninLimit := application.FailedSigninLimit
 	if failedSigninLimit == 0 {
 		failedSigninLimit = DefaultFailedSigninLimit
 	}
+
+	failedSigninfrozenTime := application.FailedSigninfrozenTime
 	if failedSigninfrozenTime == 0 {
 		failedSigninfrozenTime = DefaultFailedSigninfrozenTime
 	}