diff --git a/controllers/application.go b/controllers/application.go index fac99c63..699f0dc3 100644 --- a/controllers/application.go +++ b/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)) } diff --git a/object/application.go b/object/application.go index 6f8e6df9..5fd4b37f 100644 --- a/object/application.go +++ b/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 } diff --git a/object/check.go b/object/check.go index 5e0c4731..1a53c564 100644 --- a/object/check.go +++ b/object/check.go @@ -28,8 +28,7 @@ import ( ) const ( - DefaultFailedSigninLimit = 5 - // DefaultFailedSigninfrozenTime The unit of frozen time is minutes + DefaultFailedSigninLimit = 5 DefaultFailedSigninfrozenTime = 15 ) @@ -509,12 +508,11 @@ func CheckToEnableCaptcha(application *Application, organization, username strin return false, err } - var failedSigninLimit int - if application.FailedSigninLimit == 0 { - failedSigninLimit = 5 - } else { - failedSigninLimit = application.FailedSigninLimit + failedSigninLimit := application.FailedSigninLimit + if failedSigninLimit == 0 { + failedSigninLimit = DefaultFailedSigninLimit } + return user != nil && user.SigninWrongTimes >= failedSigninLimit, nil } return providerItem.Rule == "Always", nil diff --git a/object/check_util.go b/object/check_util.go index 88a89394..1d5e3bed 100644 --- a/object/check_util.go +++ b/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 }