Revert "feat: don't send verification code if failed signin limit is reached …"

This reverts commit f2e3037bc5.

controllers/auth.go

@@ -986,18 +986,6 @@ func (c *ApiController) Login() {
 		}
 	}
 
-	if authForm.Language != "" {
-		user := c.getCurrentUser()
-		if user != nil {
-			user.Language = authForm.Language
-			_, err = object.UpdateUser(user.GetId(), user, []string{"language"}, user.IsAdmin)
-			if err != nil {
-				c.ResponseError(err.Error())
-				return
-			}
-		}
-	}
-
 	c.Data["json"] = resp
 	c.ServeJSON()
 }

form/auth.go

@@ -34,7 +34,6 @@ type AuthForm struct {
 	Phone          string `json:"phone"`
 	Affiliation    string `json:"affiliation"`
 	IdCard         string `json:"idCard"`
-	Language       string `json:"language"`
 	Region         string `json:"region"`
 	InvitationCode string `json:"invitationCode"`
 

web/src/auth/LoginPage.js

@@ -61,7 +61,6 @@ class LoginPage extends React.Component {
       isTermsOfUseVisible: false,
       termsOfUseContent: "",
       orgChoiceMode: new URLSearchParams(props.location?.search).get("orgChoiceMode") ?? null,
-      userLang: null,
     };
 
     if (this.state.type === "cas" && props.match?.params.casApplicationName !== undefined) {
@@ -416,7 +415,6 @@ class LoginPage extends React.Component {
 
   login(values) {
     // here we are supposed to determine whether Casdoor is working as an OAuth server or CAS server
-    values["language"] = this.state.userLang ?? "";
     if (this.state.type === "cas") {
       // CAS
       const casParams = Util.getCasParameters();
@@ -568,7 +566,7 @@ class LoginPage extends React.Component {
       return (
         <div key={resultItemKey} className="login-languages">
           <div dangerouslySetInnerHTML={{__html: ("<style>" + signinItem.customCss?.replaceAll("<style>", "").replaceAll("</style>", "") + "</style>")}} />
-          <LanguageSelect languages={application.organizationObj.languages} onClick={key => {this.setState({userLang: key});}} />
+          <LanguageSelect languages={application.organizationObj.languages} />
         </div>
       );
     } else if (signinItem.name === "Signin methods") {
@@ -807,6 +805,7 @@ class LoginPage extends React.Component {
         <Form
           name="normal_login"
           initialValues={{
+
             organization: application.organization,
             application: application.name,
             autoSignin: true,

web/src/common/select/LanguageSelect.js

@@ -30,7 +30,6 @@ class LanguageSelect extends React.Component {
     this.state = {
       classes: props,
       languages: props.languages ?? Setting.Countries.map(item => item.key),
-      onClick: props.onClick,
     };
 
     Setting.Countries.forEach((country) => {
@@ -51,9 +50,6 @@ class LanguageSelect extends React.Component {
   render() {
     const languageItems = this.getOrganizationLanguages(this.state.languages);
     const onClick = (e) => {
-      if (typeof this.state.onClick === "function") {
-        this.state.onClick(e.key);
-      }
       Setting.setLanguage(e.key);
     };