feat: make enableErrorMask work for corner cases by moving checks from controller to Translate() (#3996)

controllers/account.go

@@ -286,8 +286,7 @@ func (c *ApiController) Signup() {
 		}
 	}
 
-	if application.HasPromptPage() && user.Type == "normal-user" {
-		// The prompt page needs the user to be signed in
+	if user.Type == "normal-user" {
 		c.SetSessionUsername(user.GetId())
 	}
 

controllers/auth.go

@@ -355,20 +355,27 @@ func isProxyProviderType(providerType string) bool {
 
 func checkMfaEnable(c *ApiController, user *object.User, organization *object.Organization, verificationType string) bool {
 	if object.IsNeedPromptMfa(organization, user) {
-		// The prompt page needs the user to be srigned in
+		// The prompt page needs the user to be signed in
 		c.SetSessionUsername(user.GetId())
 		c.ResponseOk(object.RequiredMfa)
 		return true
 	}
 
 	if user.IsMfaEnabled() {
+		currentTime := util.String2Time(util.GetCurrentTime())
+		mfaRememberDeadline := util.String2Time(user.MfaRememberDeadline)
+		if user.MfaRememberDeadline != "" && mfaRememberDeadline.After(currentTime) {
+			return false
+		}
 		c.setMfaUserSession(user.GetId())
 		mfaList := object.GetAllMfaProps(user, true)
 		mfaAllowList := []*object.MfaProps{}
+		mfaRememberInHours := organization.MfaRememberInHours
 		for _, prop := range mfaList {
 			if prop.MfaType == verificationType || !prop.Enabled {
 				continue
 			}
+			prop.MfaRememberInHours = mfaRememberInHours
 			mfaAllowList = append(mfaAllowList, prop)
 		}
 		if len(mfaAllowList) >= 1 {
@@ -973,6 +980,28 @@ func (c *ApiController) Login() {
 			return
 		}
 
+		var application *object.Application
+		if authForm.ClientId == "" {
+			application, err = object.GetApplication(fmt.Sprintf("admin/%s", authForm.Application))
+		} else {
+			application, err = object.GetApplicationByClientId(authForm.ClientId)
+		}
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+
+		if application == nil {
+			c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist"), authForm.Application))
+			return
+		}
+
+		var organization *object.Organization
+		organization, err = object.GetOrganization(util.GetId("admin", application.Organization))
+		if err != nil {
+			c.ResponseError(c.T(err.Error()))
+		}
+
 		if authForm.Passcode != "" {
 			if authForm.MfaType == c.GetSession("verificationCodeType") {
 				c.ResponseError("Invalid multi-factor authentication type")
@@ -999,6 +1028,17 @@ func (c *ApiController) Login() {
 				}
 			}
 
+			if authForm.EnableMfaRemember {
+				mfaRememberInSeconds := organization.MfaRememberInHours * 3600
+				currentTime := util.String2Time(util.GetCurrentTime())
+				duration := time.Duration(mfaRememberInSeconds) * time.Second
+				user.MfaRememberDeadline = util.Time2String(currentTime.Add(duration))
+				_, err = object.UpdateUser(user.GetId(), user, []string{"mfa_remember_deadline"}, user.IsAdmin)
+				if err != nil {
+					c.ResponseError(err.Error())
+					return
+				}
+			}
 			c.SetSession("verificationCodeType", "")
 		} else if authForm.RecoveryCode != "" {
 			err = object.MfaRecover(user, authForm.RecoveryCode)
@@ -1011,22 +1051,6 @@ func (c *ApiController) Login() {
 			return
 		}
 
-		var application *object.Application
-		if authForm.ClientId == "" {
-			application, err = object.GetApplication(fmt.Sprintf("admin/%s", authForm.Application))
-		} else {
-			application, err = object.GetApplicationByClientId(authForm.ClientId)
-		}
-		if err != nil {
-			c.ResponseError(err.Error())
-			return
-		}
-
-		if application == nil {
-			c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist"), authForm.Application))
-			return
-		}
-
 		resp = c.HandleLoggedIn(application, user, &authForm)
 		c.setMfaUserSession("")
 

controllers/mfa.go

@@ -58,6 +58,12 @@ func (c *ApiController) MfaSetupInitiate() {
 		return
 	}
 
+	organization, err := object.GetOrganizationByUser(user)
+	if err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+
 	mfaProps, err := MfaUtil.Initiate(user.GetId())
 	if err != nil {
 		c.ResponseError(err.Error())
@@ -66,6 +72,7 @@ func (c *ApiController) MfaSetupInitiate() {
 
 	recoveryCode := uuid.NewString()
 	mfaProps.RecoveryCodes = []string{recoveryCode}
+	mfaProps.MfaRememberInHours = organization.MfaRememberInHours
 
 	resp := mfaProps
 	c.ResponseOk(resp)

controllers/organization.go

@@ -98,6 +98,10 @@ func (c *ApiController) GetOrganization() {
 		return
 	}
 
+	if organization != nil && organization.MfaRememberInHours == 0 {
+		organization.MfaRememberInHours = 12
+	}
+
 	c.ResponseOk(organization)
 }
 

controllers/service.go

@@ -140,6 +140,9 @@ func (c *ApiController) SendEmail() {
 	}
 	content = strings.Replace(content, "%{user.friendlyName}", userString, 1)
 
+	matchContent := object.ResetLinkReg.Find([]byte(content))
+	content = strings.Replace(content, string(matchContent), "", -1)
+
 	for _, receiver := range emailForm.Receivers {
 		err = object.SendEmail(provider, emailForm.Title, content, receiver, emailForm.Sender)
 		if err != nil {

controllers/util.go

@@ -54,13 +54,6 @@ func (c *ApiController) ResponseError(error string, data ...interface{}) {
 		return
 	}
 
-	enableErrorMask := conf.GetConfigBool("enableErrorMask")
-	if enableErrorMask {
-		if strings.HasPrefix(error, "The user: ") && strings.HasSuffix(error, " doesn't exist") || strings.HasPrefix(error, "用户: ") && strings.HasSuffix(error, "不存在") {
-			error = c.T("check:password or code is incorrect")
-		}
-	}
-
 	resp := &Response{Status: "error", Msg: error}
 	c.ResponseJsonData(resp, data...)
 }

controllers/verification.go

@@ -258,7 +258,7 @@ func (c *ApiController) SendVerificationCode() {
 			return
 		}
 
-		sendResp = object.SendVerificationCodeToEmail(organization, user, provider, clientIp, vform.Dest)
+		sendResp = object.SendVerificationCodeToEmail(organization, user, provider, clientIp, vform.Dest, vform.Method, c.Ctx.Request.Host, application.Name)
 	case object.VerifyTypePhone:
 		if vform.Method == LoginVerification || vform.Method == ForgetVerification {
 			if user != nil && util.GetMaskedPhone(user.Phone) == vform.Dest {

cred/md5-user-salt.go

@@ -38,9 +38,20 @@ func NewMd5UserSaltCredManager() *Md5UserSaltCredManager {
 }
 
 func (cm *Md5UserSaltCredManager) GetHashedPassword(password string, salt string) string {
+	if salt == "" {
+		return getMd5HexDigest(password)
+	}
+
 	return getMd5HexDigest(getMd5HexDigest(password) + salt)
 }
 
 func (cm *Md5UserSaltCredManager) IsPasswordCorrect(plainPwd string, hashedPwd string, salt string) bool {
+	// For backward-compatibility
+	if salt == "" {
+		if hashedPwd == cm.GetHashedPassword(getMd5HexDigest(plainPwd), salt) {
+			return true
+		}
+	}
+
 	return hashedPwd == cm.GetHashedPassword(plainPwd, salt)
 }

cred/sha256-salt.go

@@ -38,9 +38,20 @@ func NewSha256SaltCredManager() *Sha256SaltCredManager {
 }
 
 func (cm *Sha256SaltCredManager) GetHashedPassword(password string, salt string) string {
+	if salt == "" {
+		return getSha256HexDigest(password)
+	}
+
 	return getSha256HexDigest(getSha256HexDigest(password) + salt)
 }
 
 func (cm *Sha256SaltCredManager) IsPasswordCorrect(plainPwd string, hashedPwd string, salt string) bool {
+	// For backward-compatibility
+	if salt == "" {
+		if hashedPwd == cm.GetHashedPassword(getSha256HexDigest(plainPwd), salt) {
+			return true
+		}
+	}
+
 	return hashedPwd == cm.GetHashedPassword(plainPwd, salt)
 }

cred/sha512-salt.go

@@ -38,9 +38,20 @@ func NewSha512SaltCredManager() *Sha512SaltCredManager {
 }
 
 func (cm *Sha512SaltCredManager) GetHashedPassword(password string, salt string) string {
+	if salt == "" {
+		return getSha512HexDigest(password)
+	}
+
 	return getSha512HexDigest(getSha512HexDigest(password) + salt)
 }
 
 func (cm *Sha512SaltCredManager) IsPasswordCorrect(plainPwd string, hashedPwd string, salt string) bool {
+	// For backward-compatibility
+	if salt == "" {
+		if hashedPwd == cm.GetHashedPassword(getSha512HexDigest(plainPwd), salt) {
+			return true
+		}
+	}
+
 	return hashedPwd == cm.GetHashedPassword(plainPwd, salt)
 }

form/auth.go

@@ -61,9 +61,10 @@ type AuthForm struct {
 	CaptchaToken string `json:"captchaToken"`
 	ClientSecret string `json:"clientSecret"`
 
-	MfaType      string `json:"mfaType"`
-	Passcode     string `json:"passcode"`
-	RecoveryCode string `json:"recoveryCode"`
+	MfaType           string `json:"mfaType"`
+	Passcode          string `json:"passcode"`
+	RecoveryCode      string `json:"recoveryCode"`
+	EnableMfaRemember bool   `json:"enableMfaRemember"`
 
 	Plan    string `json:"plan"`
 	Pricing string `json:"pricing"`

i18n/locales/ar/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/cs/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Vaše oblast neumožňuje registraci pomocí telefonu",
     "password or code is incorrect": "heslo nebo kód je nesprávné",
-    "password or code is incorrect, you have %d remaining chances": "heslo nebo kód je nesprávné, máte %d zbývajících pokusů",
+    "password or code is incorrect, you have %s remaining chances": "heslo nebo kód je nesprávné, máte %s zbývajících pokusů",
     "unsupported password type: %s": "nepodporovaný typ hesla: %s"
   },
   "enforcer": {

i18n/locales/de/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Ihre Region ist nicht berechtigt, sich telefonisch anzumelden",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "Das Passwort oder der Code ist falsch. Du hast noch %d Versuche übrig",
+    "password or code is incorrect, you have %s remaining chances": "Das Passwort oder der Code ist falsch. Du hast noch %s Versuche übrig",
     "unsupported password type: %s": "Nicht unterstützter Passworttyp: %s"
   },
   "enforcer": {

i18n/locales/en/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/es/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Tu región no está permitida para registrarse por teléfono",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "Contraseña o código incorrecto, tienes %d intentos restantes",
+    "password or code is incorrect, you have %s remaining chances": "Contraseña o código incorrecto, tienes %s intentos restantes",
     "unsupported password type: %s": "Tipo de contraseña no compatible: %s"
   },
   "enforcer": {

i18n/locales/fa/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "منطقه شما اجازه ثبت‌نام با تلفن را ندارد",
     "password or code is incorrect": "رمز عبور یا کد نادرست است",
-    "password or code is incorrect, you have %d remaining chances": "رمز عبور یا کد نادرست است، شما %d فرصت باقی‌مانده دارید",
+    "password or code is incorrect, you have %s remaining chances": "رمز عبور یا کد نادرست است، شما %s فرصت باقی‌مانده دارید",
     "unsupported password type: %s": "نوع رمز عبور پشتیبانی نشده: %s"
   },
   "enforcer": {

i18n/locales/fi/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/fr/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Votre région n'est pas autorisée à s'inscrire par téléphone",
     "password or code is incorrect": "mot de passe ou code invalide",
-    "password or code is incorrect, you have %d remaining chances": "Le mot de passe ou le code est incorrect, il vous reste %d chances",
+    "password or code is incorrect, you have %s remaining chances": "Le mot de passe ou le code est incorrect, il vous reste %s chances",
     "unsupported password type: %s": "Type de mot de passe non pris en charge : %s"
   },
   "enforcer": {

i18n/locales/he/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/id/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Wilayah Anda tidak diizinkan untuk mendaftar melalui telepon",
     "password or code is incorrect": "kata sandi atau kode salah",
-    "password or code is incorrect, you have %d remaining chances": "Sandi atau kode salah, Anda memiliki %d kesempatan tersisa",
+    "password or code is incorrect, you have %s remaining chances": "Sandi atau kode salah, Anda memiliki %s kesempatan tersisa",
     "unsupported password type: %s": "jenis sandi tidak didukung: %s"
   },
   "enforcer": {

i18n/locales/it/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/ja/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "あなたの地域は電話でサインアップすることができません",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "パスワードまたはコードが間違っています。あと%d回の試行機会があります",
+    "password or code is incorrect, you have %s remaining chances": "パスワードまたはコードが間違っています。あと%s回の試行機会があります",
     "unsupported password type: %s": "サポートされていないパスワードタイプ：%s"
   },
   "enforcer": {

i18n/locales/kk/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/ko/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "당신의 지역은 전화로 가입할 수 없습니다",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "암호 또는 코드가 올바르지 않습니다. %d번의 기회가 남아 있습니다",
+    "password or code is incorrect, you have %s remaining chances": "암호 또는 코드가 올바르지 않습니다. %s번의 기회가 남아 있습니다",
     "unsupported password type: %s": "지원되지 않는 암호 유형: %s"
   },
   "enforcer": {

i18n/locales/ms/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/nl/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/pl/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/pt/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "senha ou código incorreto",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/ru/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Ваш регион не разрешает регистрацию по телефону",
     "password or code is incorrect": "неправильный пароль или код",
-    "password or code is incorrect, you have %d remaining chances": "Неправильный пароль или код, у вас осталось %d попыток",
+    "password or code is incorrect, you have %s remaining chances": "Неправильный пароль или код, у вас осталось %s попыток",
     "unsupported password type: %s": "неподдерживаемый тип пароля: %s"
   },
   "enforcer": {

i18n/locales/sk/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Váš región neumožňuje registráciu cez telefón",
     "password or code is incorrect": "heslo alebo kód je nesprávne",
-    "password or code is incorrect, you have %d remaining chances": "heslo alebo kód je nesprávne, máte %d zostávajúcich pokusov",
+    "password or code is incorrect, you have %s remaining chances": "heslo alebo kód je nesprávne, máte %s zostávajúcich pokusov",
     "unsupported password type: %s": "nepodporovaný typ hesla: %s"
   },
   "enforcer": {

i18n/locales/sv/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/tr/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "şifre veya kod hatalı",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/uk/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "password or code is incorrect, you have %s remaining chances": "password or code is incorrect, you have %s remaining chances",
     "unsupported password type: %s": "unsupported password type: %s"
   },
   "enforcer": {

i18n/locales/vi/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"",
     "Your region is not allow to signup by phone": "Vùng của bạn không được phép đăng ký bằng điện thoại",
     "password or code is incorrect": "password or code is incorrect",
-    "password or code is incorrect, you have %d remaining chances": "Mật khẩu hoặc mã không chính xác, bạn còn %d lần cơ hội",
+    "password or code is incorrect, you have %s remaining chances": "Mật khẩu hoặc mã không chính xác, bạn còn %s lần cơ hội",
     "unsupported password type: %s": "Loại mật khẩu không được hỗ trợ: %s"
   },
   "enforcer": {

i18n/locales/zh/data.json

@@ -85,7 +85,7 @@
     "Your password has expired. Please reset your password by clicking \\\"Forgot password\\\"": "您的密码已过期。请点击 \\\"忘记密码\\\" 以重置密码",
     "Your region is not allow to signup by phone": "所在地区不支持手机号注册",
     "password or code is incorrect": "密码错误",
-    "password or code is incorrect, you have %d remaining chances": "密码错误，您还有 %d 次尝试的机会",
+    "password or code is incorrect, you have %s remaining chances": "密码错误，您还有 %s 次尝试的机会",
     "unsupported password type: %s": "不支持的密码类型: %s"
   },
   "enforcer": {

i18n/util.go

@@ -19,14 +19,21 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/casdoor/casdoor/conf"
 	"github.com/casdoor/casdoor/util"
 )
 
+var enableErrorMask = false
+
 //go:embed locales/*/data.json
 var f embed.FS
 
 var langMap = make(map[string]map[string]map[string]string) // for example : langMap[en][account][Invalid information] = Invalid information
 
+func init() {
+	enableErrorMask = conf.GetConfigBool("enableErrorMask")
+}
+
 func getI18nFilePath(category string, language string) string {
 	if category == "backend" {
 		return fmt.Sprintf("../i18n/locales/%s/data.json", language)
@@ -74,6 +81,15 @@ func applyData(data1 *I18nData, data2 *I18nData) {
 }
 
 func Translate(language string, errorText string) string {
+	modified := false
+	if enableErrorMask {
+		if errorText == "general:The user: %s doesn't exist" ||
+			errorText == "check:password or code is incorrect, you have %s remaining chances" {
+			modified = true
+			errorText = "check:password or code is incorrect"
+		}
+	}
+
 	tokens := strings.SplitN(errorText, ":", 2)
 	if !strings.Contains(errorText, ":") || len(tokens) != 2 {
 		return fmt.Sprintf("Translate error: the error text doesn't contain \":\", errorText = %s", errorText)
@@ -97,5 +113,9 @@ func Translate(language string, errorText string) string {
 	if res == "" {
 		res = tokens[1]
 	}
+
+	if modified {
+		res += "%.s"
+	}
 	return res
 }

idp/lark.go

@@ -27,16 +27,22 @@ import (
 )
 
 type LarkIdProvider struct {
-	Client *http.Client
-	Config *oauth2.Config
+	Client     *http.Client
+	Config     *oauth2.Config
+	LarkDomain string
 }
 
-func NewLarkIdProvider(clientId string, clientSecret string, redirectUrl string) *LarkIdProvider {
+func NewLarkIdProvider(clientId string, clientSecret string, redirectUrl string, useGlobalEndpoint bool) *LarkIdProvider {
 	idp := &LarkIdProvider{}
 
+	if useGlobalEndpoint {
+		idp.LarkDomain = "https://open.larksuite.com"
+	} else {
+		idp.LarkDomain = "https://open.feishu.cn"
+	}
+
 	config := idp.getConfig(clientId, clientSecret, redirectUrl)
 	idp.Config = config
-
 	return idp
 }
 
@@ -47,7 +53,7 @@ func (idp *LarkIdProvider) SetHttpClient(client *http.Client) {
 // getConfig return a point of Config, which describes a typical 3-legged OAuth2 flow
 func (idp *LarkIdProvider) getConfig(clientId string, clientSecret string, redirectUrl string) *oauth2.Config {
 	endpoint := oauth2.Endpoint{
-		TokenURL: "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal",
+		TokenURL: idp.LarkDomain + "/open-apis/auth/v3/tenant_access_token/internal",
 	}
 
 	config := &oauth2.Config{
@@ -162,6 +168,7 @@ type LarkUserInfo struct {
 	} `json:"data"`
 }
 
+// GetUserInfo use LarkAccessToken gotten before return LinkedInUserInf
 // GetUserInfo use LarkAccessToken gotten before return LinkedInUserInfo
 // get more detail via: https://docs.microsoft.com/en-us/linkedin/consumer/integrations/self-serve/sign-in-with-linkedin?context=linkedin/consumer/context
 func (idp *LarkIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
@@ -175,7 +182,7 @@ func (idp *LarkIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
 		return nil, err
 	}
 
-	req, err := http.NewRequest("POST", "https://open.feishu.cn/open-apis/authen/v1/access_token", strings.NewReader(string(data)))
+	req, err := http.NewRequest("POST", idp.LarkDomain+"/open-apis/authen/v1/access_token", strings.NewReader(string(data)))
 	if err != nil {
 		return nil, err
 	}

idp/provider.go

@@ -87,7 +87,7 @@ func GetIdProvider(idpInfo *ProviderInfo, redirectUrl string) (IdProvider, error
 			return nil, fmt.Errorf("WeCom provider subType: %s is not supported", idpInfo.SubType)
 		}
 	case "Lark":
-		return NewLarkIdProvider(idpInfo.ClientId, idpInfo.ClientSecret, redirectUrl), nil
+		return NewLarkIdProvider(idpInfo.ClientId, idpInfo.ClientSecret, redirectUrl, idpInfo.DisableSsl), nil
 	case "GitLab":
 		return NewGitlabIdProvider(idpInfo.ClientId, idpInfo.ClientSecret, redirectUrl), nil
 	case "ADFS":

object/check.go

@@ -252,7 +252,7 @@ func CheckPassword(user *User, password string, lang string, options ...bool) er
 
 	credManager := cred.GetCredManager(passwordType)
 	if credManager == nil {
-		return fmt.Errorf(i18n.Translate(lang, "check:unsupported password type: %s"), organization.PasswordType)
+		return fmt.Errorf(i18n.Translate(lang, "check:unsupported password type: %s"), passwordType)
 	}
 
 	if organization.MasterPassword != "" {
@@ -265,6 +265,16 @@ func CheckPassword(user *User, password string, lang string, options ...bool) er
 		return recordSigninErrorInfo(user, lang, enableCaptcha)
 	}
 
+	isOutdated := passwordType != organization.PasswordType
+	if isOutdated {
+		user.Password = password
+		user.UpdateUserPassword(organization)
+		_, err = UpdateUser(user.GetId(), user, []string{"password", "password_type", "password_salt"}, true)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resetUserSigninErrorTimes(user)
 }
 

object/check_util.go

@@ -17,6 +17,7 @@ package object
 import (
 	"fmt"
 	"regexp"
+	"strconv"
 	"time"
 
 	"github.com/casdoor/casdoor/i18n"
@@ -100,7 +101,7 @@ func recordSigninErrorInfo(user *User, lang string, options ...bool) error {
 	if leftChances == 0 && enableCaptcha {
 		return fmt.Errorf(i18n.Translate(lang, "check:password or code is incorrect"))
 	} else if leftChances >= 0 {
-		return fmt.Errorf(i18n.Translate(lang, "check:password or code is incorrect, you have %d remaining chances"), leftChances)
+		return fmt.Errorf(i18n.Translate(lang, "check:password or code is incorrect, you have %s remaining chances"), strconv.Itoa(leftChances))
 	}
 
 	// don't show the chance error message if the user has no chance left

object/mfa.go

@@ -21,13 +21,14 @@ import (
 )
 
 type MfaProps struct {
-	Enabled       bool     `json:"enabled"`
-	IsPreferred   bool     `json:"isPreferred"`
-	MfaType       string   `json:"mfaType" form:"mfaType"`
-	Secret        string   `json:"secret,omitempty"`
-	CountryCode   string   `json:"countryCode,omitempty"`
-	URL           string   `json:"url,omitempty"`
-	RecoveryCodes []string `json:"recoveryCodes,omitempty"`
+	Enabled            bool     `json:"enabled"`
+	IsPreferred        bool     `json:"isPreferred"`
+	MfaType            string   `json:"mfaType" form:"mfaType"`
+	Secret             string   `json:"secret,omitempty"`
+	CountryCode        string   `json:"countryCode,omitempty"`
+	URL                string   `json:"url,omitempty"`
+	RecoveryCodes      []string `json:"recoveryCodes,omitempty"`
+	MfaRememberInHours int      `json:"mfaRememberInHours"`
 }
 
 type MfaInterface interface {

object/oidc_discovery.go

@@ -124,7 +124,7 @@ func GetOidcDiscovery(host string) OidcDiscovery {
 		JwksUri:                                fmt.Sprintf("%s/.well-known/jwks", originBackend),
 		IntrospectionEndpoint:                  fmt.Sprintf("%s/api/login/oauth/introspect", originBackend),
 		ResponseTypesSupported:                 []string{"code", "token", "id_token", "code token", "code id_token", "token id_token", "code token id_token", "none"},
-		ResponseModesSupported:                 []string{"query", "fragment", "login", "code", "link"},
+		ResponseModesSupported:                 []string{"query", "fragment", "form_post"},
 		GrantTypesSupported:                    []string{"password", "authorization_code"},
 		SubjectTypesSupported:                  []string{"public"},
 		IdTokenSigningAlgValuesSupported:       []string{"RS256", "RS512", "ES256", "ES384", "ES512"},

object/organization.go

@@ -81,11 +81,12 @@ type Organization struct {
 	UseEmailAsUsername     bool       `json:"useEmailAsUsername"`
 	EnableTour             bool       `json:"enableTour"`
 	IpRestriction          string     `json:"ipRestriction"`
-	NavItems               []string   `xorm:"varchar(1000)" json:"navItems"`
-	WidgetItems            []string   `xorm:"varchar(1000)" json:"widgetItems"`
+	NavItems               []string   `xorm:"mediumtext" json:"navItems"`
+	WidgetItems            []string   `xorm:"mediumtext" json:"widgetItems"`
 
-	MfaItems     []*MfaItem     `xorm:"varchar(300)" json:"mfaItems"`
-	AccountItems []*AccountItem `xorm:"varchar(5000)" json:"accountItems"`
+	MfaItems           []*MfaItem     `xorm:"varchar(300)" json:"mfaItems"`
+	MfaRememberInHours int            `json:"mfaRememberInHours"`
+	AccountItems       []*AccountItem `xorm:"mediumtext" json:"accountItems"`
 }
 
 func GetOrganizationCount(owner, name, field, value string) (int64, error) {

object/user.go

@@ -190,7 +190,7 @@ type User struct {
 
 	WebauthnCredentials []webauthn.Credential `xorm:"webauthnCredentials blob" json:"webauthnCredentials"`
 	PreferredMfaType    string                `xorm:"varchar(100)" json:"preferredMfaType"`
-	RecoveryCodes       []string              `xorm:"varchar(1000)" json:"recoveryCodes"`
+	RecoveryCodes       []string              `xorm:"mediumtext" json:"recoveryCodes"`
 	TotpSecret          string                `xorm:"varchar(100)" json:"totpSecret"`
 	MfaPhoneEnabled     bool                  `json:"mfaPhoneEnabled"`
 	MfaEmailEnabled     bool                  `json:"mfaEmailEnabled"`
@@ -204,17 +204,18 @@ type User struct {
 
 	Roles       []*Role       `json:"roles"`
 	Permissions []*Permission `json:"permissions"`
-	Groups      []string      `xorm:"groups varchar(1000)" json:"groups"`
+	Groups      []string      `xorm:"mediumtext" json:"groups"`
 
 	LastChangePasswordTime string `xorm:"varchar(100)" json:"lastChangePasswordTime"`
 	LastSigninWrongTime    string `xorm:"varchar(100)" json:"lastSigninWrongTime"`
 	SigninWrongTimes       int    `json:"signinWrongTimes"`
 
-	ManagedAccounts    []ManagedAccount `xorm:"managedAccounts blob" json:"managedAccounts"`
-	MfaAccounts        []MfaAccount     `xorm:"mfaAccounts blob" json:"mfaAccounts"`
-	MfaItems           []*MfaItem       `xorm:"varchar(300)" json:"mfaItems"`
-	NeedUpdatePassword bool             `json:"needUpdatePassword"`
-	IpWhitelist        string           `xorm:"varchar(200)" json:"ipWhitelist"`
+	ManagedAccounts     []ManagedAccount `xorm:"managedAccounts blob" json:"managedAccounts"`
+	MfaAccounts         []MfaAccount     `xorm:"mfaAccounts blob" json:"mfaAccounts"`
+	MfaItems            []*MfaItem       `xorm:"varchar(300)" json:"mfaItems"`
+	MfaRememberDeadline string           `xorm:"varchar(100)" json:"mfaRememberDeadline"`
+	NeedUpdatePassword  bool             `json:"needUpdatePassword"`
+	IpWhitelist         string           `xorm:"varchar(200)" json:"ipWhitelist"`
 }
 
 type Userinfo struct {
@@ -792,7 +793,7 @@ func UpdateUser(id string, user *User, columns []string, isAdmin bool) (bool, er
 			"eveonline", "fitbit", "gitea", "heroku", "influxcloud", "instagram", "intercom", "kakao", "lastfm", "mailru", "meetup",
 			"microsoftonline", "naver", "nextcloud", "onedrive", "oura", "patreon", "paypal", "salesforce", "shopify", "soundcloud",
 			"spotify", "strava", "stripe", "type", "tiktok", "tumblr", "twitch", "twitter", "typetalk", "uber", "vk", "wepay", "xero", "yahoo",
-			"yammer", "yandex", "zoom", "custom", "need_update_password", "ip_whitelist",
+			"yammer", "yandex", "zoom", "custom", "need_update_password", "ip_whitelist", "mfa_items", "mfa_remember_deadline",
 		}
 	}
 	if isAdmin {

object/verification.go

@@ -19,6 +19,8 @@ import (
 	"fmt"
 	"math"
 	"math/rand"
+	"net/url"
+	"regexp"
 	"strings"
 	"time"
 
@@ -33,6 +35,8 @@ type VerifyResult struct {
 	Msg  string
 }
 
+var ResetLinkReg *regexp.Regexp
+
 const (
 	VerificationSuccess = iota
 	wrongCodeError
@@ -45,6 +49,10 @@ const (
 	VerifyTypeEmail = "email"
 )
 
+func init() {
+	ResetLinkReg = regexp.MustCompile("(?s)<reset-link>(.*?)</reset-link>")
+}
+
 type VerificationRecord struct {
 	Owner       string `xorm:"varchar(100) notnull pk" json:"owner"`
 	Name        string `xorm:"varchar(100) notnull pk" json:"name"`
@@ -81,7 +89,7 @@ func IsAllowSend(user *User, remoteAddr, recordType string) error {
 	return nil
 }
 
-func SendVerificationCodeToEmail(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string) error {
+func SendVerificationCodeToEmail(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string, method string, host string, applicationName string) error {
 	sender := organization.DisplayName
 	title := provider.Title
 
@@ -93,6 +101,23 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide
 	// "You have requested a verification code at Casdoor. Here is your code: %s, please enter in 5 minutes."
 	content := strings.Replace(provider.Content, "%s", code, 1)
 
+	if method == "forget" {
+		originFrontend, _ := getOriginFromHost(host)
+
+		query := url.Values{}
+		query.Add("code", code)
+		query.Add("username", user.Name)
+		query.Add("dest", util.GetMaskedEmail(dest))
+		forgetURL := originFrontend + "/forget/" + applicationName + "?" + query.Encode()
+
+		content = strings.Replace(content, "%link", forgetURL, -1)
+		content = strings.Replace(content, "<reset-link>", "", -1)
+		content = strings.Replace(content, "</reset-link>", "", -1)
+	} else {
+		matchContent := ResetLinkReg.Find([]byte(content))
+		content = strings.Replace(content, string(matchContent), "", -1)
+	}
+
 	userString := "Hi"
 	if user != nil {
 		userString = user.GetFriendlyName()

web/src/App.js

@@ -247,7 +247,9 @@ class App extends Component {
           account.organization = res.data2;
           accessToken = res.data.accessToken;
 
-          this.setLanguage(account);
+          if (!localStorage.getItem("language")) {
+            this.setLanguage(account);
+          }
           this.setTheme(Setting.getThemeData(account.organization), Conf.InitThemeAlgorithm);
           setTourLogo(account.organization.logo);
           setOrgIsTourVisible(account.organization.enableTour);
@@ -404,6 +406,7 @@ class App extends Component {
                       account={this.state.account}
                       theme={this.state.themeData}
                       themeAlgorithm={this.state.themeAlgorithm}
+                      requiredEnableMfa={this.state.requiredEnableMfa}
                       updateApplication={(application) => {
                         this.setState({
                           application: application,

web/src/ApplicationEditPage.js

@@ -1237,7 +1237,7 @@ class ApplicationEditPage extends React.Component {
   submitApplicationEdit(exitAfterSave) {
     const application = Setting.deepCopy(this.state.application);
     application.providers = application.providers?.filter(provider => this.state.providers.map(provider => provider.name).includes(provider.name));
-    application.signinMethods = application.signinMethods?.filter(signinMethod => ["Password", "Verification code", "WebAuthn", "LDAP", "Face ID"].includes(signinMethod.name));
+    application.signinMethods = application.signinMethods?.filter(signinMethod => ["Password", "Verification code", "WebAuthn", "LDAP", "Face ID", "WeChat"].includes(signinMethod.name));
 
     ApplicationBackend.updateApplication("admin", this.state.applicationName, application)
       .then((res) => {

web/src/OrganizationEditPage.js

@@ -603,6 +603,16 @@ class OrganizationEditPage extends React.Component {
             />
           </Col>
         </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
+            {Setting.getLabel(i18next.t("application:MFA remember time"), i18next.t("application:MFA remember time - Tooltip"))} :
+          </Col>
+          <Col span={22} >
+            <InputNumber style={{width: "150px"}} value={this.state.organization.mfaRememberInHours} min={1} step={1} precision={0} addonAfter="Hours" onChange={value => {
+              this.updateOrganizationField("mfaRememberInHours", value);
+            }} />
+          </Col>
+        </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
             {Setting.getLabel(i18next.t("general:MFA items"), i18next.t("general:MFA items - Tooltip"))} :

web/src/OrganizationListPage.js

@@ -25,6 +25,7 @@ import PopconfirmModal from "./common/modal/PopconfirmModal";
 class OrganizationListPage extends BaseListPage {
   newOrganization() {
     const randomName = Setting.getRandomName();
+    const DefaultMfaRememberInHours = 12;
     return {
       owner: "admin", // this.props.account.organizationname,
       name: `organization_${randomName}`,
@@ -48,6 +49,7 @@ class OrganizationListPage extends BaseListPage {
       enableSoftDeletion: false,
       isProfilePublic: true,
       enableTour: true,
+      mfaRememberInHours: DefaultMfaRememberInHours,
       accountItems: [
         {name: "Organization", visible: true, viewRule: "Public", modifyRule: "Admin"},
         {name: "ID", visible: true, viewRule: "Public", modifyRule: "Immutable"},

web/src/PlanEditPage.js

@@ -241,6 +241,21 @@ class PlanEditPage extends React.Component {
                   {id: "HKD", name: "HKD"},
                   {id: "SGD", name: "SGD"},
                   {id: "BRL", name: "BRL"},
+                  {id: "PLN", name: "PLN"},
+                  {id: "KRW", name: "KRW"},
+                  {id: "INR", name: "INR"},
+                  {id: "RUB", name: "RUB"},
+                  {id: "MXN", name: "MXN"},
+                  {id: "ZAR", name: "ZAR"},
+                  {id: "TRY", name: "TRY"},
+                  {id: "SEK", name: "SEK"},
+                  {id: "NOK", name: "NOK"},
+                  {id: "DKK", name: "DKK"},
+                  {id: "THB", name: "THB"},
+                  {id: "MYR", name: "MYR"},
+                  {id: "TWD", name: "TWD"},
+                  {id: "CZK", name: "CZK"},
+                  {id: "HUF", name: "HUF"},
                 ].map((item, index) => <Option key={index} value={item.id}>{item.name}</Option>)
               }
             </Select>

web/src/ProductBuyPage.js

@@ -141,6 +141,36 @@ class ProductBuyPage extends React.Component {
       return "S$";
     } else if (product?.currency === "BRL") {
       return "R$";
+    } else if (product?.currency === "PLN") {
+      return "zł";
+    } else if (product?.currency === "KRW") {
+      return "₩";
+    } else if (product?.currency === "INR") {
+      return "₹";
+    } else if (product?.currency === "RUB") {
+      return "₽";
+    } else if (product?.currency === "MXN") {
+      return "$";
+    } else if (product?.currency === "ZAR") {
+      return "R";
+    } else if (product?.currency === "TRY") {
+      return "₺";
+    } else if (product?.currency === "SEK") {
+      return "kr";
+    } else if (product?.currency === "NOK") {
+      return "kr";
+    } else if (product?.currency === "DKK") {
+      return "kr";
+    } else if (product?.currency === "THB") {
+      return "฿";
+    } else if (product?.currency === "MYR") {
+      return "RM";
+    } else if (product?.currency === "TWD") {
+      return "NT$";
+    } else if (product?.currency === "CZK") {
+      return "Kč";
+    } else if (product?.currency === "HUF") {
+      return "Ft";
     } else {
       return "(Unknown currency)";
     }

web/src/ProductEditPage.js

@@ -218,6 +218,21 @@ class ProductEditPage extends React.Component {
                   {id: "HKD", name: "HKD"},
                   {id: "SGD", name: "SGD"},
                   {id: "BRL", name: "BRL"},
+                  {id: "PLN", name: "PLN"},
+                  {id: "KRW", name: "KRW"},
+                  {id: "INR", name: "INR"},
+                  {id: "RUB", name: "RUB"},
+                  {id: "MXN", name: "MXN"},
+                  {id: "ZAR", name: "ZAR"},
+                  {id: "TRY", name: "TRY"},
+                  {id: "SEK", name: "SEK"},
+                  {id: "NOK", name: "NOK"},
+                  {id: "DKK", name: "DKK"},
+                  {id: "THB", name: "THB"},
+                  {id: "MYR", name: "MYR"},
+                  {id: "TWD", name: "TWD"},
+                  {id: "CZK", name: "CZK"},
+                  {id: "HUF", name: "HUF"},
                 ].map((item, index) => <Option key={index} value={item.id}>{item.name}</Option>)
               }
             </Select>

web/src/ProviderEditPage.js

@@ -931,10 +931,12 @@ class ProviderEditPage extends React.Component {
           )
         }
         {
-          this.state.provider.type !== "Google" ? null : (
+          this.state.provider.type !== "Google" && this.state.provider.type !== "Lark" ? null : (
             <Row style={{marginTop: "20px"}} >
               <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-                {Setting.getLabel(i18next.t("provider:Get phone number"), i18next.t("provider:Get phone number - Tooltip"))} :
+                {this.state.provider.type === "Google" ?
+                  Setting.getLabel(i18next.t("provider:Get phone number"), i18next.t("provider:Get phone number - Tooltip"))
+                  : Setting.getLabel(i18next.t("provider:Use global endpoint"), i18next.t("provider:Use global endpoint - Tooltip"))} :
               </Col>
               <Col span={1} >
                 <Switch disabled={!this.state.provider.clientId} checked={this.state.provider.disableSsl} onChange={checked => {
@@ -1227,7 +1229,7 @@ class ProviderEditPage extends React.Component {
                 </Col>
                 <Col span={22} >
                   <Row style={{marginTop: "20px"}} >
-                    <Button style={{marginLeft: "10px", marginBottom: "5px"}} onClick={() => this.updateProviderField("content", "You have requested a verification code at Casdoor. Here is your code: %s, please enter in 5 minutes.")} >
+                    <Button style={{marginLeft: "10px", marginBottom: "5px"}} onClick={() => this.updateProviderField("content", "You have requested a verification code at Casdoor. Here is your code: %s, please enter in 5 minutes. <reset-link>Or click %link to reset</reset-link>")} >
                       {i18next.t("provider:Reset to Default Text")}
                     </Button>
                     <Button style={{marginLeft: "10px", marginBottom: "5px"}} type="primary" onClick={() => this.updateProviderField("content", Setting.getDefaultHtmlEmailContent())} >

web/src/Setting.js

@@ -1516,6 +1516,54 @@ export function getCurrencySymbol(currency) {
     return "$";
   } else if (currency === "CNY" || currency === "cny") {
     return "¥";
+  } else if (currency === "EUR" || currency === "eur") {
+    return "€";
+  } else if (currency === "JPY" || currency === "jpy") {
+    return "¥";
+  } else if (currency === "GBP" || currency === "gbp") {
+    return "£";
+  } else if (currency === "AUD" || currency === "aud") {
+    return "A$";
+  } else if (currency === "CAD" || currency === "cad") {
+    return "C$";
+  } else if (currency === "CHF" || currency === "chf") {
+    return "CHF";
+  } else if (currency === "HKD" || currency === "hkd") {
+    return "HK$";
+  } else if (currency === "SGD" || currency === "sgd") {
+    return "S$";
+  } else if (currency === "BRL" || currency === "brl") {
+    return "R$";
+  } else if (currency === "PLN" || currency === "pln") {
+    return "zł";
+  } else if (currency === "KRW" || currency === "krw") {
+    return "₩";
+  } else if (currency === "INR" || currency === "inr") {
+    return "₹";
+  } else if (currency === "RUB" || currency === "rub") {
+    return "₽";
+  } else if (currency === "MXN" || currency === "mxn") {
+    return "$";
+  } else if (currency === "ZAR" || currency === "zar") {
+    return "R";
+  } else if (currency === "TRY" || currency === "try") {
+    return "₺";
+  } else if (currency === "SEK" || currency === "sek") {
+    return "kr";
+  } else if (currency === "NOK" || currency === "nok") {
+    return "kr";
+  } else if (currency === "DKK" || currency === "dkk") {
+    return "kr";
+  } else if (currency === "THB" || currency === "thb") {
+    return "฿";
+  } else if (currency === "MYR" || currency === "myr") {
+    return "RM";
+  } else if (currency === "TWD" || currency === "twd") {
+    return "NT$";
+  } else if (currency === "CZK" || currency === "czk") {
+    return "Kč";
+  } else if (currency === "HUF" || currency === "huf") {
+    return "Ft";
   } else {
     return currency;
   }
@@ -1580,6 +1628,11 @@ export function getDefaultHtmlEmailContent() {
     <div class="code">
         %s
     </div>
+    <reset-link>
+      <div class="link">
+         Or click this <a href="%link">link</a> to reset
+      </div>
+    </reset-link>
     <p>Thanks</p>
     <p>Casbin Team</p>
     <hr>
@@ -1614,6 +1667,36 @@ export function getCurrencyText(product) {
     return i18next.t("currency:SGD");
   } else if (product?.currency === "BRL") {
     return i18next.t("currency:BRL");
+  } else if (product?.currency === "PLN") {
+    return i18next.t("currency:PLN");
+  } else if (product?.currency === "KRW") {
+    return i18next.t("currency:KRW");
+  } else if (product?.currency === "INR") {
+    return i18next.t("currency:INR");
+  } else if (product?.currency === "RUB") {
+    return i18next.t("currency:RUB");
+  } else if (product?.currency === "MXN") {
+    return i18next.t("currency:MXN");
+  } else if (product?.currency === "ZAR") {
+    return i18next.t("currency:ZAR");
+  } else if (product?.currency === "TRY") {
+    return i18next.t("currency:TRY");
+  } else if (product?.currency === "SEK") {
+    return i18next.t("currency:SEK");
+  } else if (product?.currency === "NOK") {
+    return i18next.t("currency:NOK");
+  } else if (product?.currency === "DKK") {
+    return i18next.t("currency:DKK");
+  } else if (product?.currency === "THB") {
+    return i18next.t("currency:THB");
+  } else if (product?.currency === "MYR") {
+    return i18next.t("currency:MYR");
+  } else if (product?.currency === "TWD") {
+    return i18next.t("currency:TWD");
+  } else if (product?.currency === "CZK") {
+    return i18next.t("currency:CZK");
+  } else if (product?.currency === "HUF") {
+    return i18next.t("currency:HUF");
   } else {
     return "(Unknown currency)";
   }

web/src/TourConfig.js

@@ -208,10 +208,14 @@ let orgIsTourVisible = true;
 
 export function setOrgIsTourVisible(visible) {
   orgIsTourVisible = visible;
+  if (orgIsTourVisible === false) {
+    setIsTourVisible(false);
+  }
 }
 
 export function setIsTourVisible(visible) {
   localStorage.setItem("isTourVisible", visible);
+  window.dispatchEvent(new Event("storageTourChanged"));
 }
 
 export function setTourLogo(tourLogoSrc) {
@@ -221,7 +225,7 @@ export function setTourLogo(tourLogoSrc) {
 }
 
 export function getTourVisible() {
-  return localStorage.getItem("isTourVisible") !== "false" && orgIsTourVisible;
+  return localStorage.getItem("isTourVisible") !== "false";
 }
 
 export function getNextButtonChild(nextPathName) {

web/src/auth/AuthCallback.js

@@ -35,6 +35,30 @@ class AuthCallback extends React.Component {
     };
   }
 
+  submitFormPost(redirectUri, code, state) {
+    const form = document.createElement("form");
+    form.method = "post";
+    form.action = redirectUri;
+
+    const codeInput = document.createElement("input");
+    codeInput.type = "hidden";
+    codeInput.name = "code";
+    codeInput.value = code;
+    form.appendChild(codeInput);
+
+    if (state) {
+      const stateInput = document.createElement("input");
+      stateInput.type = "hidden";
+      stateInput.name = "state";
+      stateInput.value = state;
+      form.appendChild(stateInput);
+    }
+
+    document.body.appendChild(form);
+    form.submit();
+    setTimeout(() => form.remove(), 1000);
+  }
+
   getInnerParams() {
     // For example, for Casbin-OA, realRedirectUri = "http://localhost:9000/login"
     // realRedirectUrl = "http://localhost:9000"
@@ -158,6 +182,7 @@ class AuthCallback extends React.Component {
     // OAuth
     const oAuthParams = Util.getOAuthGetParameters(innerParams);
     const concatChar = oAuthParams?.redirectUri?.includes("?") ? "&" : "?";
+    const responseMode = oAuthParams?.responseMode || "query"; // Default to "query" if not specified
     const signinUrl = localStorage.getItem("signinUrl");
 
     AuthBackend.login(body, oAuthParams)
@@ -181,8 +206,13 @@ class AuthCallback extends React.Component {
                 Setting.goToLinkSoft(this, `/forget/${applicationName}`);
                 return;
               }
-              const code = res.data;
-              Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}code=${code}&state=${oAuthParams.state}`);
+
+              if (responseMode === "form_post") {
+                this.submitFormPost(oAuthParams?.redirectUri, res.data, oAuthParams?.state);
+              } else {
+                const code = res.data;
+                Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}code=${code}&state=${oAuthParams.state}`);
+              }
             // Setting.showMessage("success", `Authorization code: ${res.data}`);
             } else if (responseType === "token" || responseType === "id_token") {
               if (res.data3) {

web/src/auth/ForgetPage.js

@@ -31,18 +31,21 @@ const {Option} = Select;
 class ForgetPage extends React.Component {
   constructor(props) {
     super(props);
+    const queryParams = new URLSearchParams(location.search);
     this.state = {
       classes: props,
       applicationName: props.applicationName ?? props.match.params?.applicationName,
       msg: null,
-      name: props.account ? props.account.name : "",
+      name: props.account ? props.account.name : queryParams.get("username"),
       username: props.account ? props.account.name : "",
       phone: "",
       email: "",
       dest: "",
       isVerifyTypeFixed: false,
       verifyType: "", // "email", "phone"
-      current: 0,
+      current: queryParams.get("code") ? 2 : 0,
+      code: queryParams.get("code"),
+      queryParams: queryParams,
     };
     this.form = React.createRef();
   }
@@ -148,9 +151,26 @@ class ForgetPage extends React.Component {
     }
   }
 
-  onFinish(values) {
+  async onFinish(values) {
     values.username = this.state.name;
     values.userOwner = this.getApplicationObj()?.organizationObj.name;
+
+    if (this.state.queryParams.get("code")) {
+      const res = await UserBackend.verifyCode({
+        application: this.getApplicationObj().name,
+        organization: values.userOwner,
+        username: this.state.queryParams.get("dest"),
+        name: this.state.name,
+        code: this.state.code,
+        type: "login",
+      });
+
+      if (res.status !== "ok") {
+        Setting.showMessage("error", res.msg);
+        return;
+      }
+    }
+
     UserBackend.setPassword(values.userOwner, values.username, "", values?.newPassword, this.state.code).then(res => {
       if (res.status === "ok") {
         const linkInStorage = sessionStorage.getItem("signinUrl");
@@ -385,7 +405,7 @@ class ForgetPage extends React.Component {
                 },
               ]}
             />
-            <Popover placement="right" content={this.state.passwordPopover} open={this.state.passwordPopoverOpen}>
+            <Popover placement={window.innerWidth >= 960 ? "right" : "top"} content={this.state.passwordPopover} open={this.state.passwordPopoverOpen}>
               <Form.Item
                 name="newPassword"
                 hidden={this.state.current !== 2}
@@ -415,7 +435,7 @@ class ForgetPage extends React.Component {
                   }}
                   onFocus={() => {
                     this.setState({
-                      passwordPopoverOpen: true,
+                      passwordPopoverOpen: application.organizationObj.passwordOptions?.length > 0,
                       passwordPopover: PasswordChecker.renderPasswordPopover(application.organizationObj.passwordOptions, this.form.current?.getFieldValue("newPassword") ?? ""),
                     });
                   }}

web/src/auth/LoginPage.js

@@ -38,6 +38,7 @@ import {RequiredMfa} from "./mfa/MfaAuthVerifyForm";
 import {GoogleOneTapLoginVirtualButton} from "./GoogleLoginButton";
 import * as ProviderButton from "./ProviderButton";
 import {goToLink} from "../Setting";
+import WeChatLoginPanel from "./WeChatLoginPanel";
 const FaceRecognitionCommonModal = lazy(() => import("../common/modal/FaceRecognitionCommonModal"));
 const FaceRecognitionModal = lazy(() => import("../common/modal/FaceRecognitionModal"));
 
@@ -346,7 +347,7 @@ class LoginPage extends React.Component {
       return;
     }
 
-    if (resp.data2) {
+    if (resp.data3) {
       sessionStorage.setItem("signinUrl", window.location.pathname + window.location.search);
       Setting.goToLinkSoft(ths, `/forget/${application.name}`);
       return;
@@ -436,18 +437,26 @@ class LoginPage extends React.Component {
         values["password"] = passwordCipher;
       }
       const captchaRule = this.getCaptchaRule(this.getApplicationObj());
-      if (captchaRule === CaptchaRule.Always) {
-        this.setState({
-          openCaptchaModal: true,
-          values: values,
-        });
-        return;
-      } else if (captchaRule === CaptchaRule.Dynamic) {
-        this.checkCaptchaStatus(values);
-        return;
-      } else if (captchaRule === CaptchaRule.InternetOnly) {
-        this.checkCaptchaStatus(values);
-        return;
+      const application = this.getApplicationObj();
+      const noModal = application?.signinItems.map(signinItem => signinItem.name === "Captcha" && signinItem.rule === "inline").includes(true);
+      if (!noModal) {
+        if (captchaRule === CaptchaRule.Always) {
+          this.setState({
+            openCaptchaModal: true,
+            values: values,
+          });
+          return;
+        } else if (captchaRule === CaptchaRule.Dynamic) {
+          this.checkCaptchaStatus(values);
+          return;
+        } else if (captchaRule === CaptchaRule.InternetOnly) {
+          this.checkCaptchaStatus(values);
+          return;
+        }
+      } else {
+        values["captchaType"] = this.state?.captchaValues?.captchaType;
+        values["captchaToken"] = this.state?.captchaValues?.captchaToken;
+        values["clientSecret"] = this.state?.captchaValues?.clientSecret;
       }
     }
     this.login(values);
@@ -774,7 +783,7 @@ class LoginPage extends React.Component {
               </>
           }
           {
-            this.renderCaptchaModal(application)
+            application?.signinItems.map(signinItem => signinItem.name === "Captcha" && signinItem.rule === "inline").includes(true) ? null : this.renderCaptchaModal(application, false)
           }
         </Form.Item>
       );
@@ -818,6 +827,8 @@ class LoginPage extends React.Component {
           </Form.Item>
         </div>
       );
+    } else if (signinItem.name === "Captcha" && signinItem.rule === "inline") {
+      return this.renderCaptchaModal(application, true);
     } else if (signinItem.name.startsWith("Text ") || signinItem?.isCustom) {
       return (
         <div key={resultItemKey} dangerouslySetInnerHTML={{__html: signinItem.customCss}} />
@@ -877,13 +888,17 @@ class LoginPage extends React.Component {
         loginWidth += 10;
       }
 
+      if (this.state.loginMethod === "wechat") {
+        return (<WeChatLoginPanel application={application} renderFormItem={this.renderFormItem.bind(this)} loginMethod={this.state.loginMethod} loginWidth={loginWidth} renderMethodChoiceBox={this.renderMethodChoiceBox.bind(this)} />);
+      }
+
       return (
         <Form
           name="normal_login"
           initialValues={{
             organization: application.organization,
             application: application.name,
-            autoSignin: true,
+            autoSignin: !application?.signinItems.map(signinItem => signinItem.name === "Forgot password?" && signinItem.rule === "Auto sign in - False")?.includes(true),
             username: Conf.ShowGithubCorner ? "admin" : "",
             password: Conf.ShowGithubCorner ? "123" : "",
           }}
@@ -959,7 +974,7 @@ class LoginPage extends React.Component {
     });
   }
 
-  renderCaptchaModal(application) {
+  renderCaptchaModal(application, noModal) {
     if (this.getCaptchaRule(this.getApplicationObj()) === CaptchaRule.Never) {
       return null;
     }
@@ -988,6 +1003,12 @@ class LoginPage extends React.Component {
       owner={provider.owner}
       name={provider.name}
       visible={this.state.openCaptchaModal}
+      noModal={noModal}
+      onUpdateToken={(captchaType, captchaToken, clientSecret) => {
+        this.setState({captchaValues: {
+          captchaType, captchaToken, clientSecret,
+        }});
+      }}
       onOk={(captchaType, captchaToken, clientSecret) => {
         const values = this.state.values;
         values["captchaType"] = captchaType;
@@ -1040,6 +1061,10 @@ class LoginPage extends React.Component {
       return null;
     }
 
+    if (this.props.requiredEnableMfa) {
+      return null;
+    }
+
     if (this.state.userCode && this.state.userCodeStatus === "success") {
       return null;
     }
@@ -1200,6 +1225,7 @@ class LoginPage extends React.Component {
       [generateItemKey("WebAuthn", "None"), {label: i18next.t("login:WebAuthn"), key: "webAuthn"}],
       [generateItemKey("LDAP", "None"), {label: i18next.t("login:LDAP"), key: "ldap"}],
       [generateItemKey("Face ID", "None"), {label: i18next.t("login:Face ID"), key: "faceId"}],
+      [generateItemKey("WeChat", "None"), {label: i18next.t("login:WeChat"), key: "wechat"}],
     ]);
 
     application?.signinMethods?.forEach((signinMethod) => {
@@ -1221,7 +1247,7 @@ class LoginPage extends React.Component {
     if (items.length > 1) {
       return (
         <div>
-          <Tabs className="signin-methods" items={items} size={"small"} defaultActiveKey={this.getDefaultLoginMethod(application)} onChange={(key) => {
+          <Tabs className="signin-methods" items={items} size={"small"} activeKey={this.state.loginMethod} onChange={(key) => {
             this.setState({loginMethod: key});
           }} centered>
           </Tabs>

web/src/auth/Provider.js

@@ -68,6 +68,7 @@ const authInfo = {
   Lark: {
     // scope: "email",
     endpoint: "https://open.feishu.cn/open-apis/authen/v1/index",
+    endpoint2: "https://accounts.larksuite.com/open-apis/authen/v1/authorize",
   },
   GitLab: {
     scope: "read_user+profile",
@@ -406,6 +407,8 @@ export function getAuthUrl(application, provider, method, code) {
     if (provider.domain) {
       endpoint = `${provider.domain}/apps/oauth2/authorize`;
     }
+  } else if (provider.type === "Lark" && provider.disableSsl) {
+    endpoint = authInfo[provider.type].endpoint2;
   }
 
   if (provider.type === "Google" || provider.type === "GitHub" || provider.type === "Facebook"
@@ -460,6 +463,9 @@ export function getAuthUrl(application, provider, method, code) {
       return `https://error:not-supported-provider-sub-type:${provider.subType}`;
     }
   } else if (provider.type === "Lark") {
+    if (provider.disableSsl) {
+      redirectUri = encodeURIComponent(redirectUri);
+    }
     return `${endpoint}?app_id=${provider.clientId}&redirect_uri=${redirectUri}&state=${state}`;
   } else if (provider.type === "ADFS") {
     return `${provider.domain}/adfs/oauth2/authorize?client_id=${provider.clientId}&redirect_uri=${redirectUri}&state=${state}&response_type=code&nonce=casdoor&scope=openid`;

web/src/auth/ResultPage.js

@@ -18,6 +18,7 @@ import i18next from "i18next";
 import {authConfig} from "./Auth";
 import * as ApplicationBackend from "../backend/ApplicationBackend";
 import * as Setting from "../Setting";
+import * as AuthBackend from "./AuthBackend";
 
 class ResultPage extends React.Component {
   constructor(props) {
@@ -60,6 +61,22 @@ class ResultPage extends React.Component {
     this.props.onUpdateApplication(application);
   }
 
+  handleSignIn = () => {
+    AuthBackend.getAccount()
+      .then((res) => {
+        if (res.status === "ok" && res.data) {
+          const linkInStorage = sessionStorage.getItem("signinUrl");
+          if (linkInStorage !== null && linkInStorage !== "") {
+            window.location.href = linkInStorage;
+          } else {
+            Setting.goToLink("/");
+          }
+        } else {
+          Setting.redirectToLoginPage(this.state.application, this.props.history);
+        }
+      });
+  };
+
   render() {
     const application = this.state.application;
 
@@ -89,14 +106,7 @@ class ResultPage extends React.Component {
               title={i18next.t("signup:Your account has been created!")}
               subTitle={i18next.t("signup:Please click the below button to sign in")}
               extra={[
-                <Button type="primary" key="login" onClick={() => {
-                  const linkInStorage = sessionStorage.getItem("signinUrl");
-                  if (linkInStorage !== null && linkInStorage !== "") {
-                    Setting.goToLinkSoft(this, linkInStorage);
-                  } else {
-                    Setting.redirectToLoginPage(application, this.props.history);
-                  }
-                }}>
+                <Button type="primary" key="login" onClick={this.handleSignIn}>
                   {i18next.t("login:Sign In")}
                 </Button>,
               ]}

web/src/auth/SignupPage.js

@@ -607,7 +607,7 @@ class SignupPage extends React.Component {
       }
     } else if (signupItem.name === "Password") {
       return (
-        <Popover placement="right" content={this.state.passwordPopover} open={this.state.passwordPopoverOpen}>
+        <Popover placement={window.innerWidth >= 960 ? "right" : "top"} content={this.state.passwordPopover} open={this.state.passwordPopoverOpen}>
           <Form.Item
             name="password"
             className="signup-password"
@@ -635,7 +635,7 @@ class SignupPage extends React.Component {
             }}
             onFocus={() => {
               this.setState({
-                passwordPopoverOpen: true,
+                passwordPopoverOpen: application.organizationObj.passwordOptions?.length > 0,
                 passwordPopover: PasswordChecker.renderPasswordPopover(application.organizationObj.passwordOptions, this.form.current?.getFieldValue("password") ?? ""),
               });
             }}

web/src/auth/Util.js

@@ -141,6 +141,7 @@ export function getOAuthGetParameters(params) {
   const nonce = getRefinedValue(queries.get("nonce"));
   const challengeMethod = getRefinedValue(queries.get("code_challenge_method"));
   const codeChallenge = getRefinedValue(queries.get("code_challenge"));
+  const responseMode = getRefinedValue(queries.get("response_mode"));
   const samlRequest = getRefinedValue(lowercaseQueries["samlRequest".toLowerCase()]);
   const relayState = getRefinedValue(lowercaseQueries["RelayState".toLowerCase()]);
   const noRedirect = getRefinedValue(lowercaseQueries["noRedirect".toLowerCase()]);
@@ -159,6 +160,7 @@ export function getOAuthGetParameters(params) {
       nonce: nonce,
       challengeMethod: challengeMethod,
       codeChallenge: codeChallenge,
+      responseMode: responseMode,
       samlRequest: samlRequest,
       relayState: relayState,
       noRedirect: noRedirect,

web/src/auth/WeChatLoginPanel.js

@@ -0,0 +1,106 @@
+// Copyright 2025 The Casdoor Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from "react";
+import * as AuthBackend from "./AuthBackend";
+import i18next from "i18next";
+import * as Util from "./Util";
+
+class WeChatLoginPanel extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      qrCode: null,
+      loading: false,
+      ticket: null,
+    };
+    this.pollingTimer = null;
+  }
+
+  UNSAFE_componentWillMount() {
+    this.fetchQrCode();
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.loginMethod === "wechat" && prevProps.loginMethod !== "wechat") {
+      this.fetchQrCode();
+    }
+    if (prevProps.loginMethod === "wechat" && this.props.loginMethod !== "wechat") {
+      this.setState({qrCode: null, loading: false, ticket: null});
+      this.clearPolling();
+    }
+  }
+
+  componentWillUnmount() {
+    this.clearPolling();
+  }
+
+  clearPolling() {
+    if (this.pollingTimer) {
+      clearInterval(this.pollingTimer);
+      this.pollingTimer = null;
+    }
+  }
+
+  fetchQrCode() {
+    const {application} = this.props;
+    const wechatProviderItem = application?.providers?.find(p => p.provider?.type === "WeChat");
+    if (wechatProviderItem) {
+      this.setState({loading: true, qrCode: null, ticket: null});
+      AuthBackend.getWechatQRCode(`${wechatProviderItem.provider.owner}/${wechatProviderItem.provider.name}`).then(res => {
+        if (res.status === "ok" && res.data) {
+          this.setState({qrCode: res.data, loading: false, ticket: res.data2});
+          this.clearPolling();
+          this.pollingTimer = setInterval(() => {
+            Util.getEvent(application, wechatProviderItem.provider, res.data2, "signup");
+          }, 1000);
+        } else {
+          this.setState({qrCode: null, loading: false, ticket: null});
+          this.clearPolling();
+        }
+      }).catch(() => {
+        this.setState({qrCode: null, loading: false, ticket: null});
+        this.clearPolling();
+      });
+    }
+  }
+
+  render() {
+    const {application, loginWidth = 320} = this.props;
+    const {loading, qrCode} = this.state;
+    return (
+      <div style={{width: loginWidth, margin: "0 auto", textAlign: "center", marginTop: 16}}>
+        {application.signinItems?.filter(item => item.name === "Logo").map(signinItem => this.props.renderFormItem(application, signinItem))}
+        {this.props.renderMethodChoiceBox()}
+        {application.signinItems?.filter(item => item.name === "Languages").map(signinItem => this.props.renderFormItem(application, signinItem))}
+        {loading ? (
+          <div style={{marginTop: 16}}>
+            <span>{i18next.t("login:Loading")}</span>
+          </div>
+        ) : qrCode ? (
+          <div style={{marginTop: 2}}>
+            <img src={`data:image/png;base64,${qrCode}`} alt="WeChat QR code" style={{width: 250, height: 250}} />
+            <div style={{marginTop: 8}}>
+              <a onClick={e => {e.preventDefault(); this.fetchQrCode();}}>
+                {i18next.t("login:Refresh")}
+              </a>
+            </div>
+          </div>
+        ) : null}
+      </div>
+    );
+  }
+}
+
+export default WeChatLoginPanel;

web/src/auth/mfa/MfaAuthVerifyForm.js

@@ -31,9 +31,9 @@ export function MfaAuthVerifyForm({formValues, authParams, mfaProps, application
   const [mfaType, setMfaType] = useState(mfaProps.mfaType);
   const [recoveryCode, setRecoveryCode] = useState("");
 
-  const verify = ({passcode}) => {
+  const verify = ({passcode, enableMfaRemember}) => {
     setLoading(true);
-    const values = {...formValues, passcode};
+    const values = {...formValues, passcode, enableMfaRemember};
     values["mfaType"] = mfaProps.mfaType;
     const loginFunction = formValues.type === "cas" ? AuthBackend.loginCas : AuthBackend.login;
     loginFunction(values, authParams).then((res) => {

web/src/auth/mfa/MfaVerifySmsForm.js

@@ -1,5 +1,5 @@
 import {UserOutlined} from "@ant-design/icons";
-import {Button, Form, Input, Space} from "antd";
+import {Button, Checkbox, Form, Input, Space} from "antd";
 import i18next from "i18next";
 import React, {useEffect} from "react";
 import {CountryCodeSelect} from "../../common/select/CountryCodeSelect";
@@ -12,6 +12,13 @@ export const MfaVerifySmsForm = ({mfaProps, application, onFinish, method, user}
   const [dest, setDest] = React.useState("");
   const [form] = Form.useForm();
 
+  const handleFinish = (values) => {
+    onFinish({
+      passcode: values.passcode,
+      enableMfaRemember: values.enableMfaRemember,
+    });
+  };
+
   useEffect(() => {
     if (method === mfaAuth) {
       setDest(mfaProps.secret);
@@ -51,9 +58,10 @@ export const MfaVerifySmsForm = ({mfaProps, application, onFinish, method, user}
     <Form
       form={form}
       style={{width: "300px"}}
-      onFinish={onFinish}
+      onFinish={handleFinish}
       initialValues={{
         countryCode: mfaProps.countryCode,
+        enableMfaRemember: false,
       }}
     >
       {isShowText() ?
@@ -109,6 +117,14 @@ export const MfaVerifySmsForm = ({mfaProps, application, onFinish, method, user}
           application={application}
         />
       </Form.Item>
+      <Form.Item
+        name="enableMfaRemember"
+        valuePropName="checked"
+      >
+        <Checkbox>
+          {i18next.t("mfa:Remember this account for {hour} hours").replace("{hour}", mfaProps?.mfaRememberInHours)}
+        </Checkbox>
+      </Form.Item>
       <Form.Item>
         <Button
           style={{marginTop: 24}}

web/src/auth/mfa/MfaVerifyTotpForm.js

@@ -1,5 +1,5 @@
 import {CopyOutlined} from "@ant-design/icons";
-import {Button, Col, Form, Input, QRCode, Space} from "antd";
+import {Button, Checkbox, Col, Form, Input, QRCode, Space} from "antd";
 import copy from "copy-to-clipboard";
 import i18next from "i18next";
 import React from "react";
@@ -8,6 +8,13 @@ import * as Setting from "../../Setting";
 export const MfaVerifyTotpForm = ({mfaProps, onFinish}) => {
   const [form] = Form.useForm();
 
+  const handleFinish = (values) => {
+    onFinish({
+      passcode: values.passcode,
+      enableMfaRemember: values.enableMfaRemember,
+    });
+  };
+
   const renderSecret = () => {
     if (!mfaProps.secret) {
       return null;
@@ -40,7 +47,10 @@ export const MfaVerifyTotpForm = ({mfaProps, onFinish}) => {
     <Form
       form={form}
       style={{width: "300px"}}
-      onFinish={onFinish}
+      onFinish={handleFinish}
+      initialValues={{
+        enableMfaRemember: false,
+      }}
     >
       {renderSecret()}
       <Form.Item
@@ -54,6 +64,14 @@ export const MfaVerifyTotpForm = ({mfaProps, onFinish}) => {
           }}
         />
       </Form.Item>
+      <Form.Item
+        name="enableMfaRemember"
+        valuePropName="checked"
+      >
+        <Checkbox>
+          {i18next.t("mfa:Remember this account for {hour} hours").replace("{hour}", mfaProps?.mfaRememberInHours)}
+        </Checkbox>
+      </Form.Item>
       <Form.Item>
         <Button
           style={{marginTop: 24}}

web/src/common/PasswordChecker.js

@@ -82,7 +82,7 @@ export function renderPasswordPopover(options, password) {
 }
 
 export function checkPasswordComplexity(password, options) {
-  if (password.length === 0) {
+  if (!password?.length) {
     return i18next.t("login:Please input your password!");
   }
 

web/src/common/modal/CaptchaModal.js

@@ -20,7 +20,7 @@ import {CaptchaWidget} from "../CaptchaWidget";
 import {SafetyOutlined} from "@ant-design/icons";
 
 export const CaptchaModal = (props) => {
-  const {owner, name, visible, onOk, onCancel, isCurrentProvider} = props;
+  const {owner, name, visible, onOk, onUpdateToken, onCancel, isCurrentProvider, noModal} = props;
 
   const [captchaType, setCaptchaType] = React.useState("none");
   const [clientId, setClientId] = React.useState("");
@@ -36,16 +36,16 @@ export const CaptchaModal = (props) => {
   const defaultInputRef = React.useRef(null);
 
   useEffect(() => {
-    if (visible) {
+    if (visible || noModal) {
       loadCaptcha();
     } else {
       handleCancel();
       setOpen(false);
     }
-  }, [visible]);
+  }, [visible, noModal]);
 
   useEffect(() => {
-    if (captchaToken !== "" && captchaType !== "Default") {
+    if (captchaToken !== "" && captchaType !== "Default" && !noModal) {
       handleOk();
     }
   }, [captchaToken]);
@@ -81,6 +81,36 @@ export const CaptchaModal = (props) => {
   };
 
   const renderDefaultCaptcha = () => {
+    if (noModal) {
+      return (
+        <Row style={{textAlign: "center"}}>
+          <Col
+            style={{flex: noModal ? "70%" : "100%"}}>
+            <Input
+              ref={defaultInputRef}
+              value={captchaToken}
+              prefix={<SafetyOutlined />}
+              placeholder={i18next.t("general:Captcha")}
+              onChange={(e) => onChange(e.target.value)}
+            />
+          </Col>
+          <Col
+            style={{
+              flex: noModal ? "30%" : "100%",
+            }}
+          >
+            <img src={`data:image/png;base64,${captchaImg}`}
+              onClick={loadCaptcha}
+              style={{
+                borderRadius: "5px",
+                border: "1px solid #ccc",
+                marginBottom: "20px",
+                width: "100%",
+              }} alt="captcha" />
+          </Col>
+        </Row>
+      );
+    }
     return (
       <Col style={{textAlign: "center"}}>
         <div style={{display: "inline-block"}}>
@@ -113,6 +143,9 @@ export const CaptchaModal = (props) => {
 
   const onChange = (token) => {
     setCaptchaToken(token);
+    if (noModal) {
+      onUpdateToken?.(captchaType, token, clientSecret);
+    }
   };
 
   const renderCaptcha = () => {
@@ -153,28 +186,33 @@ export const CaptchaModal = (props) => {
     return null;
   };
 
-  return (
-    <Modal
-      closable={true}
-      maskClosable={false}
-      destroyOnClose={true}
-      title={i18next.t("general:Captcha")}
-      open={open}
-      okText={i18next.t("general:OK")}
-      cancelText={i18next.t("general:Cancel")}
-      width={350}
-      footer={renderFooter()}
-      onCancel={handleCancel}
-      afterClose={handleCancel}
-      onOk={handleOk}
-    >
-      <div style={{marginTop: "20px", marginBottom: "50px"}}>
-        {
-          renderCaptcha()
-        }
-      </div>
-    </Modal>
-  );
+  if (noModal) {
+    return renderCaptcha();
+
+  } else {
+    return (
+      <Modal
+        closable={true}
+        maskClosable={false}
+        destroyOnClose={true}
+        title={i18next.t("general:Captcha")}
+        open={open}
+        okText={i18next.t("general:OK")}
+        cancelText={i18next.t("general:Cancel")}
+        width={350}
+        footer={renderFooter()}
+        onCancel={handleCancel}
+        afterClose={handleCancel}
+        onOk={handleOk}
+      >
+        <div style={{marginTop: "20px", marginBottom: "50px"}}>
+          {
+            renderCaptcha()
+          }
+        </div>
+      </Modal>
+    );
+  }
 };
 
 export const CaptchaRule = {

web/src/common/modal/PasswordModal.js

@@ -132,18 +132,18 @@ export const PasswordModal = (props) => {
             </Row>
           ) : null}
           <Row style={{width: "100%", marginBottom: "20px"}}>
-            <Popover placement="right" content={passwordPopover} open={passwordPopoverOpen}>
+            <Popover placement={window.innerWidth >= 960 ? "right" : "top"} content={passwordPopover} open={passwordPopoverOpen}>
               <Input.Password
                 addonBefore={i18next.t("user:New Password")}
                 placeholder={i18next.t("user:input password")}
                 onChange={(e) => {
                   handleNewPassword(e.target.value);
-                  setPasswordPopoverOpen(true);
+                  setPasswordPopoverOpen(passwordOptions?.length > 0);
                   setPasswordPopover(PasswordChecker.renderPasswordPopover(passwordOptions, e.target.value));
 
                 }}
                 onFocus={() => {
-                  setPasswordPopoverOpen(true);
+                  setPasswordPopoverOpen(passwordOptions?.length > 0);
                   setPasswordPopover(PasswordChecker.renderPasswordPopover(passwordOptions, newPassword));
                 }}
                 onBlur={() => {

web/src/locales/ar/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/cs/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Upravit HTML hlavičky",
     "Header HTML - Tooltip": "Přizpůsobit hlavičku vstupní stránky vaší aplikace",
     "Incremental": "Inkrementální",
+    "Inline": "Inline",
     "Input": "Vstup",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Vlevo",
     "Logged in successfully": "Úspěšně přihlášen",
     "Logged out successfully": "Úspěšně odhlášen",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Nová aplikace",
     "No verification": "Bez ověření",
@@ -93,6 +96,7 @@
     "Please input your application!": "Zadejte svou aplikaci!",
     "Please input your organization!": "Zadejte svou organizaci!",
     "Please select a HTML file": "Vyberte HTML soubor",
+    "Pop up": "Pop up",
     "Random": "Náhodný",
     "Real name": "Skutečné jméno",
     "Redirect URL": "Přesměrovací URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Upravit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Nepodařilo se uložit",
     "Failed to sync": "Nepodařilo se synchronizovat",
     "Failed to verify": "Nepodařilo se ověřit",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "URL ikony favicon použité na všech stránkách Casdoor organizace",
     "First name": "Křestní jméno",
@@ -427,6 +447,7 @@
     "Tokens": "Tokeny",
     "Tour": "Tour",
     "Transactions": "Transakce",
+    "True": "True",
     "Type": "Typ",
     "Type - Tooltip": "Typ - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Vyberte organizaci pro přihlášení",
     "Please type an organization to sign in": "Zadejte organizaci pro přihlášení",
     "Redirecting, please wait.": "Přesměrování, prosím čekejte.",
+    "Refresh": "Refresh",
     "Sign In": "Přihlásit se",
     "Sign in with Face ID": "Přihlásit se pomocí Face ID",
     "Sign in with WebAuthn": "Přihlásit se pomocí WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "Zadaný údaj není platné telefonní číslo!",
     "To access": "Pro přístup",
     "Verification code": "Ověřovací kód",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "zaregistrujte se nyní",
     "username, Email or phone": "uživatelské jméno, Email nebo telefon"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Obnovení dvoufaktorového ověřování",
     "Multi-factor recover description": "Popis obnovení dvoufaktorového ověřování",
     "Or copy the secret to your Authenticator App": "Nebo zkopírujte tajný kód do své aplikace Authenticator",
-    "Passcode": "Přístupový kód",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Nejprve prosím spojte svůj email, systém automaticky použije tento email pro dvoufaktorové ověřování",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Nejprve prosím spojte svůj telefon, systém automaticky použije tento telefon pro dvoufaktorové ověřování",
     "Please confirm the information below": "Potvrďte prosím níže uvedené informace",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Uložte si tento obnovovací kód. Pokud vaše zařízení nemůže poskytnout ověřovací kód, můžete resetovat dvoufaktorové ověřování pomocí tohoto kódu",
     "Protect your account with Multi-factor authentication": "Chraňte svůj účet pomocí dvoufaktorového ověřování",
     "Recovery code": "Obnovovací kód",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Naskenujte QR kód pomocí aplikace Authenticator",
     "Set preferred": "Nastavit jako preferované",
     "Setup": "Nastavení",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Povolit skenování QR kódu WeChat Media Platform pro přihlášení",
     "Use WeChat Media Platform to login": "Použít WeChat Media Platform pro přihlášení",
     "Use WeChat Open Platform to login": "Použít WeChat Open Platform pro přihlášení",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "Tok uživatele",

web/src/locales/de/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Links",
     "Logged in successfully": "Erfolgreich eingeloggt",
     "Logged out successfully": "Erfolgreich ausgeloggt",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Neue Anwendung",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Bitte geben Sie Ihre Anwendung ein!",
     "Please input your organization!": "Bitte geben Sie Ihre Organisation ein!",
     "Please select a HTML file": "Bitte wählen Sie eine HTML-Datei aus",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Weiterleitungs-URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Konnte nicht gespeichert werden",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon-URL, die auf allen Casdoor-Seiten der Organisation verwendet wird",
     "First name": "Vorname",
@@ -427,6 +447,7 @@
     "Tokens": "Token",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Umleitung, bitte warten.",
+    "Refresh": "Refresh",
     "Sign In": "Anmelden",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Melden Sie sich mit WebAuthn an",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "Zum Zugriff",
     "Verification code": "Verifizierungscode",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "Melde dich jetzt an",
     "username, Email or phone": "Benutzername, E-Mail oder Telefon"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/en/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "Configures the duration that a account is remembered as trusted after a successful MFA login",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/es/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Izquierda",
     "Logged in successfully": "Acceso satisfactorio",
     "Logged out successfully": "Cerró sesión exitosamente",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Nueva aplicación",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "¡Por favor, ingrese su solicitud!",
     "Please input your organization!": "¡Por favor, ingrese su organización!",
     "Please select a HTML file": "Por favor, seleccione un archivo HTML",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redireccionar URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "No se pudo guardar",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon (ícono de favoritos)",
     "Favicon - Tooltip": "URL del icono Favicon utilizado en todas las páginas de Casdoor de la organización",
     "First name": "Nombre de pila",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "Dirección URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirigiendo, por favor espera.",
+    "Refresh": "Refresh",
     "Sign In": "Iniciar sesión",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Iniciar sesión con WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "para acceder",
     "Verification code": "Código de verificación",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn (Autenticación Web)",
     "sign up now": "Regístrate ahora",
     "username, Email or phone": "Nombre de usuario, correo electrónico o teléfono"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/fa/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "ویرایش HTML سربرگ",
     "Header HTML - Tooltip": "کد head صفحه ورود برنامه خود را سفارشی کنید",
     "Incremental": "افزایشی",
+    "Inline": "Inline",
     "Input": "ورودی",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "چپ",
     "Logged in successfully": "با موفقیت وارد شدید",
     "Logged out successfully": "با موفقیت خارج شدید",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "انتخاب‌های متعدد",
     "New Application": "برنامه جدید",
     "No verification": "بدون تأیید",
@@ -93,6 +96,7 @@
     "Please input your application!": "لطفاً برنامه خود را وارد کنید!",
     "Please input your organization!": "لطفاً سازمان خود را وارد کنید!",
     "Please select a HTML file": "لطفاً یک فایل HTML انتخاب کنید",
+    "Pop up": "Pop up",
     "Random": "تصادفی",
     "Real name": "نام واقعی",
     "Redirect URL": "آدرس بازگشت",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "ویرایش Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "عدم موفقیت در ذخیره",
     "Failed to sync": "عدم موفقیت در همگام‌سازی",
     "Failed to verify": "عدم موفقیت در تأیید",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "آدرس آیکون Favicon استفاده شده در تمام صفحات Casdoor سازمان",
     "First name": "نام",
@@ -427,6 +447,7 @@
     "Tokens": "توکن‌ها",
     "Tour": "Tour",
     "Transactions": "تراکنش‌ها",
+    "True": "True",
     "Type": "نوع",
     "Type - Tooltip": "نوع - راهنمای ابزار",
     "URL": "آدرس",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "لطفاً یک سازمان برای ورود انتخاب کنید",
     "Please type an organization to sign in": "لطفاً یک سازمان برای ورود تایپ کنید",
     "Redirecting, please wait.": "در حال هدایت، لطفاً صبر کنید.",
+    "Refresh": "Refresh",
     "Sign In": "ورود",
     "Sign in with Face ID": "ورود با شناسه چهره",
     "Sign in with WebAuthn": "ورود با WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "ورودی شماره تلفن معتبر نیست!",
     "To access": "برای دسترسی",
     "Verification code": "کد تأیید",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "ثبت‌نام کنید",
     "username, Email or phone": "نام کاربری، ایمیل یا تلفن"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "بازیابی چندعاملی",
     "Multi-factor recover description": "توضیح بازیابی چندعاملی",
     "Or copy the secret to your Authenticator App": "یا راز را به برنامه تأیید هویت خود کپی کنید",
-    "Passcode": "کد عبور",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "لطفاً ابتدا ایمیل خود را متصل کنید، سیستم به‌طور خودکار از ایمیل برای احراز هویت چندعاملی استفاده می‌کند",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "لطفاً ابتدا تلفن خود را متصل کنید، سیستم به‌طور خودکار از تلفن برای احراز هویت چندعاملی استفاده می‌کند",
     "Please confirm the information below": "لطفاً اطلاعات زیر را تأیید کنید",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "لطفاً این کد بازیابی را ذخیره کنید. هنگامی که دستگاه شما نتواند کد تأیید ارائه دهد، می‌توانید احراز هویت mfa را با این کد بازیابی تنظیم مجدد کنید",
     "Protect your account with Multi-factor authentication": "حساب خود را با احراز هویت چندعاملی محافظت کنید",
     "Recovery code": "کد بازیابی",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "کد QR را با برنامه تأیید هویت خود اسکن کنید",
     "Set preferred": "تنظیم به‌عنوان مورد علاقه",
     "Setup": "راه‌اندازی",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "آیا اجازه اسکن کد QR پلتفرم رسانه WeChat برای ورود داده شود",
     "Use WeChat Media Platform to login": "استفاده از پلتفرم رسانه WeChat برای ورود",
     "Use WeChat Open Platform to login": "استفاده از پلتفرم باز WeChat برای ورود",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "جریان کاربر",

web/src/locales/fi/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/fr/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incrémentale",
+    "Inline": "Inline",
     "Input": "Saisie",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Gauche",
     "Logged in successfully": "Connexion réussie",
     "Logged out successfully": "Déconnexion réussie",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Nouvelle application",
     "No verification": "Aucune vérification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Veuillez saisir votre application !",
     "Please input your organization!": "Veuillez saisir votre organisation !",
     "Please select a HTML file": "Veuillez sélectionner un fichier HTML",
+    "Pop up": "Pop up",
     "Random": "Aléatoire",
     "Real name": "Nom complet",
     "Redirect URL": "URL de redirection",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Éditer l'exécuteur",
@@ -278,6 +297,7 @@
     "Failed to save": "Échec de sauvegarde",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Échec de la vérification",
+    "False": "False",
     "Favicon": "Icône du site",
     "Favicon - Tooltip": "L'URL de l'icône « favicon » utilisée dans toutes les pages Casdoor de l'organisation",
     "First name": "Prénom",
@@ -427,6 +447,7 @@
     "Tokens": "Jetons",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Infobulle",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Veuillez choisir une organisation pour vous connecter",
     "Please type an organization to sign in": "Veuillez entrer une organisation pour vous connecter",
     "Redirecting, please wait.": "Redirection en cours, veuillez patienter.",
+    "Refresh": "Refresh",
     "Sign In": "Se connecter",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Connectez-vous avec WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "Pour accéder à",
     "Verification code": "Code de vérification",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "Inscrivez-vous maintenant",
     "username, Email or phone": "identifiant, adresse e-mail ou téléphone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Restauration de l'authentification multifacteur",
     "Multi-factor recover description": "Description de la restauration de l'authentification multifacteur",
     "Or copy the secret to your Authenticator App": "Ou copiez la clé secrète dans votre application d'authentification",
-    "Passcode": "Code d'accès",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Veuillez lier votre e-mail en premier, le système l'utilisera automatiquement pour l'authentification multifacteur",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Veuillez lier votre numéro de téléphone en premier, le système l'utilisera automatiquement pour l'authentification multifacteur",
     "Please confirm the information below": "Veuillez confirmer les informations ci-dessous",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Veuillez enregistrer ce code de récupération. Si votre appareil ne peut pas vous fournir un code d'authentification, vous pourrez réinitialiser l'authentification multifacteur avec ce code de récupération",
     "Protect your account with Multi-factor authentication": "Protégez votre compte avec l'authentification multifacteur",
     "Recovery code": "Code de récupération",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scannez le QR code avec votre application d'authentification",
     "Set preferred": "Définir comme préféré",
     "Setup": "Configurer",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/he/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/id/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Kiri",
     "Logged in successfully": "Berhasil masuk",
     "Logged out successfully": "Berhasil keluar dari sistem",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "The duration for which the account is remembered as trusted after a successful MFA login",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Aplikasi Baru",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Silakan masukkan aplikasi Anda!",
     "Please input your organization!": "Silakan masukkan organisasi Anda!",
     "Please select a HTML file": "Silahkan pilih file HTML",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Mengalihkan URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Gagal menyimpan",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "URL ikon Favicon yang digunakan di semua halaman Casdoor organisasi",
     "First name": "Nama depan",
@@ -427,6 +447,7 @@
     "Tokens": "Token-token",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Mengalihkan, harap tunggu.",
+    "Refresh": "Refresh",
     "Sign In": "Masuk",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Masuk dengan WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "Untuk mengakses",
     "Verification code": "Kode verifikasi",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "Daftar sekarang",
     "username, Email or phone": "nama pengguna, Email atau nomor telepon"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/it/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/ja/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "左",
     "Logged in successfully": "正常にログインしました",
     "Logged out successfully": "正常にログアウトしました",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "新しいアプリケーション",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "あなたの申請を入力してください！",
     "Please input your organization!": "あなたの組織を入力してください！",
     "Please select a HTML file": "HTMLファイルを選択してください",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "リダイレクトURL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "保存に失敗しました",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "ファビコン",
     "Favicon - Tooltip": "組織のすべてのCasdoorページに使用されるFaviconアイコンのURL",
     "First name": "名前",
@@ -427,6 +447,7 @@
     "Tokens": "トークン",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "リダイレクト中、お待ちください。",
+    "Refresh": "Refresh",
     "Sign In": "サインイン",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "WebAuthnでサインインしてください",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "アクセスする",
     "Verification code": "確認コード",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "今すぐサインアップ",
     "username, Email or phone": "ユーザー名、メールアドレス、または電話番号"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/kk/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/ko/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "왼쪽",
     "Logged in successfully": "성공적으로 로그인했습니다",
     "Logged out successfully": "로그아웃이 성공적으로 되었습니다",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "새로운 응용 프로그램",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "당신의 신청서를 입력해주세요!",
     "Please input your organization!": "귀하의 조직을 입력해 주세요!",
     "Please select a HTML file": "HTML 파일을 선택해 주세요",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "리디렉트 URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "저장에 실패했습니다",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "파비콘",
     "Favicon - Tooltip": "조직의 모든 Casdoor 페이지에서 사용되는 Favicon 아이콘 URL",
     "First name": "이름",
@@ -427,6 +447,7 @@
     "Tokens": "토큰",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "리디렉팅 중입니다. 잠시 기다려주세요.",
+    "Refresh": "Refresh",
     "Sign In": "로그인",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "WebAuthn으로 로그인하세요",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "접근하다",
     "Verification code": "인증 코드",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "지금 가입하세요",
     "username, Email or phone": "유저명, 이메일 또는 전화번호"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/ms/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/nl/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/pl/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/pt/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Esquerda",
     "Logged in successfully": "Login realizado com sucesso",
     "Logged out successfully": "Logout realizado com sucesso",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Nova Aplicação",
     "No verification": "Sem verificação",
@@ -93,6 +96,7 @@
     "Please input your application!": "Por favor, insira o nome da sua aplicação!",
     "Please input your organization!": "Por favor, insira o nome da sua organização!",
     "Please select a HTML file": "Por favor, selecione um arquivo HTML",
+    "Pop up": "Pop up",
     "Random": "Aleatório",
     "Real name": "Nome real",
     "Redirect URL": "URL de redirecionamento",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Editar Executor",
@@ -278,6 +297,7 @@
     "Failed to save": "Falha ao salvar",
     "Failed to sync": "Falha ao sincronizar",
     "Failed to verify": "Falha ao verificar",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "URL do ícone de favicon usado em todas as páginas do Casdoor da organização",
     "First name": "Nome",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Tipo",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecionando, por favor aguarde.",
+    "Refresh": "Refresh",
     "Sign In": "Entrar",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Entrar com WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "Para acessar",
     "Verification code": "Código de verificação",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "Inscreva-se agora",
     "username, Email or phone": "Nome de usuário, email ou telefone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Código de acesso",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/ru/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Последовательный",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Левый",
     "Logged in successfully": "Успешный вход в систему",
     "Logged out successfully": "Успешный выход из системы",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Новое приложение",
     "No verification": "Нет верификации",
@@ -93,6 +96,7 @@
     "Please input your application!": "Пожалуйста, введите свою заявку!",
     "Please input your organization!": "Пожалуйста, введите название вашей организации!",
     "Please select a HTML file": "Пожалуйста, выберите файл HTML",
+    "Pop up": "Pop up",
     "Random": "Случайный",
     "Real name": "Полное имя",
     "Redirect URL": "Перенаправление URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Редактировать контролёра доступа",
@@ -278,6 +297,7 @@
     "Failed to save": "Не удалось сохранить",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Фавикон",
     "Favicon - Tooltip": "URL иконки Favicon, используемый на всех страницах организации Casdoor",
     "First name": "Имя",
@@ -427,6 +447,7 @@
     "Tokens": "Токены",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Перенаправление, пожалуйста, подождите.",
+    "Refresh": "Refresh",
     "Sign In": "Войти",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Войти с помощью WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "Для доступа",
     "Verification code": "Код подтверждения",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "Зарегистрируйтесь сейчас",
     "username, Email or phone": "имя пользователя, электронная почта или телефон"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/sk/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "HTML hlavičky - Upraviť",
     "Header HTML - Tooltip": "Vlastný HTML kód pre hlavičku vašej vstupnej stránky aplikácie",
     "Incremental": "Postupný",
+    "Inline": "Inline",
     "Input": "Vstup",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Vľavo",
     "Logged in successfully": "Úspešne prihlásený",
     "Logged out successfully": "Úspešne odhlásený",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Nová aplikácia",
     "No verification": "Bez overenia",
@@ -93,6 +96,7 @@
     "Please input your application!": "Zadajte svoju aplikáciu!",
     "Please input your organization!": "Zadajte svoju organizáciu!",
     "Please select a HTML file": "Vyberte HTML súbor",
+    "Pop up": "Pop up",
     "Random": "Náhodný",
     "Real name": "Skutočné meno",
     "Redirect URL": "URL presmerovania",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Upraviť vynútiteľa",
@@ -278,6 +297,7 @@
     "Failed to save": "Nepodarilo sa uložiť",
     "Failed to sync": "Nepodarilo sa synchronizovať",
     "Failed to verify": "Nepodarilo sa overiť",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "URL ikony favicon používaná na všetkých stránkach Casdoor organizácie",
     "First name": "Meno",
@@ -427,6 +447,7 @@
     "Tokens": "Tokeny",
     "Tour": "Tour",
     "Transactions": "Transakcie",
+    "True": "True",
     "Type": "Typ",
     "Type - Tooltip": "Typ",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Vyberte organizáciu na prihlásenie",
     "Please type an organization to sign in": "Zadajte organizáciu na prihlásenie",
     "Redirecting, please wait.": "Prebieha presmerovanie, prosím čakajte.",
+    "Refresh": "Refresh",
     "Sign In": "Prihlásiť sa",
     "Sign in with Face ID": "Prihlásiť sa pomocou Face ID",
     "Sign in with WebAuthn": "Prihlásiť sa pomocou WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "Zadaný údaj nie je platné telefónne číslo!",
     "To access": "Na prístup",
     "Verification code": "Overovací kód",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "zaregistrujte sa teraz",
     "username, Email or phone": "meno používateľa, Email alebo telefón"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Obnova viacfaktorovej autentifikácie",
     "Multi-factor recover description": "Popis obnovy viacfaktorovej autentifikácie",
     "Or copy the secret to your Authenticator App": "Alebo skopírujte tajomstvo do svojej aplikácie na autentifikáciu",
-    "Passcode": "Kód",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Najskôr pripojte svoj email, systém automaticky použije mail na viacfaktorovú autentifikáciu",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Najskôr pripojte svoj telefón, systém automaticky použije telefón na viacfaktorovú autentifikáciu",
     "Please confirm the information below": "Potvrďte informácie nižšie",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Uložte si tento obnovovací kód. Keď vaše zariadenie nebude schopné poskytnúť overovací kód, môžete obnoviť MFA autentifikáciu pomocou tohto obnovovacieho kódu",
     "Protect your account with Multi-factor authentication": "Chráňte svoj účet pomocou viacfaktorovej autentifikácie",
     "Recovery code": "Obnovovací kód",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Naskenujte QR kód pomocou svojej aplikácie na autentifikáciu",
     "Set preferred": "Nastaviť ako preferované",
     "Setup": "Nastaviť",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Či povoliť skenovanie QR kódu WeChat Media Platform na prihlásenie",
     "Use WeChat Media Platform to login": "Použiť WeChat Media Platform na prihlásenie",
     "Use WeChat Open Platform to login": "Použiť WeChat Open Platform na prihlásenie",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "Tok používateľa",

web/src/locales/sv/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Real name",
     "Redirect URL": "Redirect URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "First name",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
+    "Refresh": "Refresh",
     "Sign In": "Sign In",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/tr/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Incremental",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Sol",
     "Logged in successfully": "Başarıyla giriş yapıldı",
     "Logged out successfully": "Başarıyla çıkış yapıldı",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "New Application",
     "No verification": "No verification",
@@ -93,6 +96,7 @@
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
+    "Pop up": "Pop up",
     "Random": "Random",
     "Real name": "Gerçek isim",
     "Redirect URL": "Yönlendirme URL'si",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Failed to save",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Doğrulama başarısız oldu",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
     "First name": "İsim",
@@ -427,6 +447,7 @@
     "Tokens": "Tokens",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Yönlendiriliyor, lütfen bekleyiniz.",
+    "Refresh": "Refresh",
     "Sign In": "Oturum aç",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "To access",
     "Verification code": "Verification code",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "hemen kaydolun",
     "username, Email or phone": "kullanıcı adınız, Eposta adresiniz ve telefon numaranız"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Veya kod 'u Authenticator uygulamasından kopyalayın",
-    "Passcode": "Parola",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Lütfen aşağıdaki bilgileri doğrulayın",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Lütfen bu kurtarma kodlarını kaydedin. Cihazınızdan yetkilendirme kodları oluşturamazsanız bu kodları kullanarak sorunu çözebilirsiniz",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Kurtarma kodu",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Bu QR kodunu kimlik doğrulama uygulamanızla tarayın",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/uk/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "HTML-код заголовка – Редагувати",
     "Header HTML - Tooltip": "Налаштуйте тег head на сторінці входу до програми",
     "Incremental": "Інкрементний",
+    "Inline": "Inline",
     "Input": "Введення",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Ліворуч",
     "Logged in successfully": "Успішно ввійшли",
     "Logged out successfully": "Успішно вийшов",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Нова заявка",
     "No verification": "Без підтвердження",
@@ -93,6 +96,7 @@
     "Please input your application!": "Будь ласка, введіть свою заявку!",
     "Please input your organization!": "Будь ласка, введіть вашу організацію!",
     "Please select a HTML file": "Виберіть файл HTML",
+    "Pop up": "Pop up",
     "Random": "Випадковий",
     "Real name": "Справжнє ім'я",
     "Redirect URL": "URL-адреса перенаправлення",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Редагувати Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Не вдалося зберегти",
     "Failed to sync": "Не вдалося синхронізувати",
     "Failed to verify": "Не вдалося перевірити",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "URL-адреса піктограми Favicon, яка використовується на всіх сторінках Casdoor організації",
     "First name": "Ім'я",
@@ -427,6 +447,7 @@
     "Tokens": "Жетони",
     "Tour": "Tour",
     "Transactions": "транзакції",
+    "True": "True",
     "Type": "Тип",
     "Type - Tooltip": "Тип - підказка",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Виберіть організацію для входу",
     "Please type an organization to sign in": "Будь ласка, введіть організацію, щоб увійти",
     "Redirecting, please wait.": "Перенаправлення, будь ласка, зачекайте.",
+    "Refresh": "Refresh",
     "Sign In": "Увійти",
     "Sign in with Face ID": "Увійдіть за допомогою Face ID",
     "Sign in with WebAuthn": "Увійдіть за допомогою WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "Введений недійсний номер телефону!",
     "To access": "Доступу",
     "Verification code": "Код підтвердження",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "Зареєструйся зараз",
     "username, Email or phone": "ім'я користувача, електронну пошту або телефон"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Багатофакторне відновлення",
     "Multi-factor recover description": "Опис багатофакторного відновлення",
     "Or copy the secret to your Authenticator App": "Або скопіюйте секрет у програму Authenticator",
-    "Passcode": "Пароль",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Спочатку прив’яжіть свою електронну адресу, система автоматично використовуватиме її для багатофакторної автентифікації",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Спочатку прив’яжіть свій телефон, система автоматично використовує телефон для багатофакторної автентифікації",
     "Please confirm the information below": "Підтвердьте інформацію нижче",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Будь ласка, збережіть цей код відновлення. ",
     "Protect your account with Multi-factor authentication": "Захистіть свій обліковий запис за допомогою багатофакторної автентифікації",
     "Recovery code": "Код відновлення",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Відскануйте QR-код за допомогою програми Authenticator",
     "Set preferred": "Встановити перевагу",
     "Setup": "Налаштування",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Чи дозволяти сканування QR-коду WeChat Media Platform для входу",
     "Use WeChat Media Platform to login": "Використовуйте медіаплатформу WeChat для входу",
     "Use WeChat Open Platform to login": "Використовуйте відкриту платформу WeChat для входу",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "Потік користувачів",

web/src/locales/vi/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - Edit",
     "Header HTML - Tooltip": "Custom the head tag of your application entry page",
     "Incremental": "Tăng",
+    "Inline": "Inline",
     "Input": "Input",
     "Internet-Only": "Internet-Only",
     "Invalid characters in application name": "Invalid characters in application name",
@@ -82,6 +83,8 @@
     "Left": "Trái",
     "Logged in successfully": "Đăng nhập thành công",
     "Logged out successfully": "Đã đăng xuất thành công",
+    "MFA remember time": "MFA remember time",
+    "MFA remember time - Tooltip": "MFA remember time - Tooltip",
     "Multiple Choices": "Multiple Choices",
     "New Application": "Ứng dụng mới",
     "No verification": "Không xác minh",
@@ -93,6 +96,7 @@
     "Please input your application!": "Vui lòng nhập ứng dụng của bạn!",
     "Please input your organization!": "Vui lòng nhập tổ chức của bạn!",
     "Please select a HTML file": "Vui lòng chọn tệp HTML",
+    "Pop up": "Pop up",
     "Random": "Ngẫu nhiên",
     "Real name": "Tên thật",
     "Redirect URL": "Chuyển hướng URL",
@@ -175,12 +179,27 @@
     "CAD": "CAD",
     "CHF": "CHF",
     "CNY": "CNY",
+    "CZK": "CZK",
+    "DKK": "DKK",
     "EUR": "EUR",
     "GBP": "GBP",
     "HKD": "HKD",
+    "HUF": "HUF",
+    "INR": "INR",
     "JPY": "JPY",
+    "KRW": "KRW",
+    "MXN": "MXN",
+    "MYR": "MYR",
+    "NOK": "NOK",
+    "PLN": "PLN",
+    "RUB": "RUB",
+    "SEK": "SEK",
     "SGD": "SGD",
-    "USD": "USD"
+    "THB": "THB",
+    "TRY": "TRY",
+    "TWD": "TWD",
+    "USD": "USD",
+    "ZAR": "ZAR"
   },
   "enforcer": {
     "Edit Enforcer": "Edit Enforcer",
@@ -278,6 +297,7 @@
     "Failed to save": "Không thể lưu lại",
     "Failed to sync": "Failed to sync",
     "Failed to verify": "Failed to verify",
+    "False": "False",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "URL biểu tượng Favicon được sử dụng trong tất cả các trang của tổ chức Casdoor",
     "First name": "Tên",
@@ -427,6 +447,7 @@
     "Tokens": "Mã thông báo",
     "Tour": "Tour",
     "Transactions": "Transactions",
+    "True": "True",
     "Type": "Type",
     "Type - Tooltip": "Type - Tooltip",
     "URL": "URL",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "Please select an organization to sign in",
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Đang chuyển hướng, vui lòng đợi.",
+    "Refresh": "Refresh",
     "Sign In": "Đăng nhập",
     "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Đăng nhập với WebAuthn",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "The input is not valid phone number!",
     "To access": "Để truy cập",
     "Verification code": "Mã xác thực",
+    "WeChat": "WeChat",
     "WebAuthn": "WebAuthn",
     "sign up now": "Đăng ký ngay bây giờ",
     "username, Email or phone": "Tên đăng nhập, Email hoặc điện thoại"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "Multi-factor recover",
     "Multi-factor recover description": "Multi-factor recover description",
     "Or copy the secret to your Authenticator App": "Or copy the secret to your Authenticator App",
-    "Passcode": "Passcode",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "Please bind your email first, the system will automatically uses the mail for multi-factor authentication",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "Please bind your phone first, the system automatically uses the phone for multi-factor authentication",
     "Please confirm the information below": "Please confirm the information below",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code",
     "Protect your account with Multi-factor authentication": "Protect your account with Multi-factor authentication",
     "Recovery code": "Recovery code",
+    "Remember this account for {hour} hours": "Remember this account for {hour} hours",
     "Scan the QR code with your Authenticator App": "Scan the QR code with your Authenticator App",
     "Set preferred": "Set preferred",
     "Setup": "Setup",
@@ -971,6 +994,8 @@
     "Use WeChat Media Platform in PC - Tooltip": "Whether to allow scanning WeChat Media Platform QR code to login",
     "Use WeChat Media Platform to login": "Use WeChat Media Platform to login",
     "Use WeChat Open Platform to login": "Use WeChat Open Platform to login",
+    "Use global endpoint": "Use global endpoint",
+    "Use global endpoint - Tooltip": "Use global endpoint - Tooltip",
     "Use id as name": "Use id as name",
     "Use id as name - Tooltip": "Use id as user's name",
     "User flow": "User flow",

web/src/locales/zh/data.json

@@ -75,6 +75,7 @@
     "Header HTML - Edit": "Header HTML - 编辑",
     "Header HTML - Tooltip": "自定义应用页面的head标签",
     "Incremental": "递增",
+    "Inline": "内嵌",
     "Input": "输入",
     "Internet-Only": "外网启用",
     "Invalid characters in application name": "应用名称内有非法字符",
@@ -82,6 +83,8 @@
     "Left": "居左",
     "Logged in successfully": "登录成功",
     "Logged out successfully": "登出成功",
+    "MFA remember time": "MFA记住时间",
+    "MFA remember time - Tooltip": "配置MFA登录成功后帐户被记住为受信任的持续时间",
     "Multiple Choices": "多选",
     "New Application": "添加应用",
     "No verification": "不校验",
@@ -93,6 +96,7 @@
     "Please input your application!": "请输入你的应用",
     "Please input your organization!": "请输入你的组织",
     "Please select a HTML file": "请选择一个HTML文件",
+    "Pop up": "弹框",
     "Random": "随机",
     "Real name": "真实姓名",
     "Redirect URL": "重定向 URL",
@@ -175,12 +179,27 @@
     "CAD": "加拿大元",
     "CHF": "瑞士法郎",
     "CNY": "人民币",
+    "CZK": "捷克克朗",
+    "DKK": "丹麦克朗",
     "EUR": "欧元",
     "GBP": "英镑",
     "HKD": "港币",
+    "HUF": "匈牙利福林",
+    "INR": "印度卢比",
     "JPY": "日元",
+    "KRW": "韩元",
+    "MXN": "墨西哥比索",
+    "MYR": "马来西亚林吉特",
+    "NOK": "挪威克朗",
+    "PLN": "波兰兹罗提",
+    "RUB": "俄罗斯卢布",
+    "SEK": "瑞典克朗",
     "SGD": "新加坡元",
-    "USD": "美元"
+    "THB": "泰铢",
+    "TRY": "土耳其里拉",
+    "TWD": "新台币",
+    "USD": "美元",
+    "ZAR": "南非兰特"
   },
   "enforcer": {
     "Edit Enforcer": "编辑Casbin执行器",
@@ -278,6 +297,7 @@
     "Failed to save": "保存失败",
     "Failed to sync": "同步失败",
     "Failed to verify": "验证失败",
+    "False": "假",
     "Favicon": "组织Favicon",
     "Favicon - Tooltip": "该组织所有Casdoor页面中所使用的Favicon图标URL",
     "First name": "名字",
@@ -427,6 +447,7 @@
     "Tokens": "令牌",
     "Tour": "引导",
     "Transactions": "交易",
+    "True": "真",
     "Type": "类型",
     "Type - Tooltip": "类型",
     "URL": "链接",
@@ -551,6 +572,7 @@
     "Please select an organization to sign in": "请选择要登录的组织",
     "Please type an organization to sign in": "请输入要登录的组织",
     "Redirecting, please wait.": "正在跳转, 请稍等.",
+    "Refresh": "刷新",
     "Sign In": "登录",
     "Sign in with Face ID": "人脸登录",
     "Sign in with WebAuthn": "WebAuthn登录",
@@ -564,6 +586,7 @@
     "The input is not valid phone number!": "您输入的手机号有误!",
     "To access": "访问",
     "Verification code": "验证码",
+    "WeChat": "微信",
     "WebAuthn": "Web身份验证",
     "sign up now": "立即注册",
     "username, Email or phone": "用户名、Email或手机号"
@@ -580,13 +603,13 @@
     "Multi-factor recover": "重置多因素认证",
     "Multi-factor recover description": "如果您无法访问您的设备，输入您的多因素认证恢复代码来确认您的身份",
     "Or copy the secret to your Authenticator App": "或者将这个密钥复制到你的身份验证应用中",
-    "Passcode": "认证码",
     "Please bind your email first, the system will automatically uses the mail for multi-factor authentication": "请先绑定邮箱，之后会自动使用该邮箱作为多因素认证的方式",
     "Please bind your phone first, the system automatically uses the phone for multi-factor authentication": "请先绑定手机号，之后会自动使用该手机号作为多因素认证的方式",
     "Please confirm the information below": "请确认以下信息",
     "Please save this recovery code. Once your device cannot provide an authentication code, you can reset mfa authentication by this recovery code": "请保存此恢复代码。一旦您的设备无法提供身份验证码，您可以通过此恢复码重置多因素认证",
     "Protect your account with Multi-factor authentication": "通过多因素认证保护您的帐户",
     "Recovery code": "恢复码",
+    "Remember this account for {hour} hours": "记住这个账户 {hour} 小时",
     "Scan the QR code with your Authenticator App": "用你的身份验证应用扫描二维码",
     "Set preferred": "设为首选",
     "Setup": "设置",
@@ -946,7 +969,7 @@
     "Signup HTML - Edit": "注册页面HTML - 编辑",
     "Signup HTML - Tooltip": "自定义HTML，用于替换默认的注册页面样式",
     "Signup group": "注册后的群组",
-    "Signup group - Tooltip": "Signup group - Tooltip",
+    "Signup group - Tooltip": "注册后自动加入的群组",
     "Silent": "静默",
     "Site key": "Site key",
     "Site key - Tooltip": "站点密钥",
@@ -963,22 +986,24 @@
     "Test SMTP Connection": "测试SMTP连接",
     "Third-party": "第三方",
     "This field is required": "此字段是必需的",
-    "Token URL": "Token URL",
-    "Token URL - Tooltip": "自定义OAuth的Token URL",
+    "Token URL": "Token链接",
+    "Token URL - Tooltip": "自定义OAuth的Token链接",
     "Type": "类型",
     "Type - Tooltip": "类型",
     "Use WeChat Media Platform in PC": "在PC端使用微信公众平台",
     "Use WeChat Media Platform in PC - Tooltip": "是否使用微信公众平台的二维码进行登录",
     "Use WeChat Media Platform to login": "使用微信公众平台进行登录",
     "Use WeChat Open Platform to login": "使用微信开放平台进行登录",
+    "Use global endpoint": "启用全局地址",
+    "Use global endpoint - Tooltip": "启用全局地址",
     "Use id as name": "使用id作为用户名",
     "Use id as name - Tooltip": "使用id作为用户的名字",
     "User flow": "User flow",
     "User flow - Tooltip": "User flow",
     "User mapping": "用户映射",
     "User mapping - Tooltip": "用户映射 - 工具提示",
-    "UserInfo URL": "UserInfo URL",
-    "UserInfo URL - Tooltip": "自定义OAuth的UserInfo URL",
+    "UserInfo URL": "UserInfo链接",
+    "UserInfo URL - Tooltip": "自定义OAuth的UserInfo链接",
     "Wallets": "钱包",
     "Wallets - Tooltip": "钱包 - 工具提示",
     "admin (Shared)": "admin（共享）"
@@ -1214,7 +1239,7 @@
     "Keys": "键",
     "Language": "语言",
     "Language - Tooltip": "语言 - Tooltip",
-    "Last change password time": "Last change password time",
+    "Last change password time": "上次修改密码时间",
     "Link": "绑定",
     "Location": "城市",
     "Location - Tooltip": "居住地址所在的城市",

web/src/table/SigninMethodTable.js

@@ -72,6 +72,7 @@ class SigninMethodTable extends React.Component {
       {name: "WebAuthn", displayName: i18next.t("login:WebAuthn")},
       {name: "LDAP", displayName: i18next.t("login:LDAP")},
       {name: "Face ID", displayName: i18next.t("login:Face ID")},
+      {name: "WeChat", displayName: i18next.t("login:WeChat")},
     ];
     const columns = [
       {

web/src/table/SigninTable.js

@@ -49,6 +49,9 @@ class SigninTable extends React.Component {
 
   updateField(table, index, key, value) {
     table[index][key] = value;
+    if (key === "name" && value === "Captcha") {
+      table[index]["rule"] = "pop up";
+    }
     this.updateTable(table);
   }
 
@@ -114,6 +117,8 @@ class SigninTable extends React.Component {
             {name: "Forgot password?", displayName: i18next.t("login:Forgot password?")},
             {name: "Login button", displayName: i18next.t("login:Signin button")},
             {name: "Signup link", displayName: i18next.t("general:Signup link")},
+            {name: "Captcha", displayName: i18next.t("general:Captcha")},
+            {name: "Auto sign in", displayName: i18next.t("login:Auto sign in")},
           ];
 
           const getItemDisplayName = (text) => {
@@ -249,6 +254,19 @@ class SigninTable extends React.Component {
               {id: "small", name: i18next.t("application:Small icon")},
             ];
           }
+          if (record.name === "Captcha") {
+            options = [
+              {id: "pop up", name: i18next.t("application:Pop up")},
+              {id: "inline", name: i18next.t("application:Inline")},
+            ];
+          }
+          if (record.name === "Forgot password?") {
+            options = [
+              {id: "None", name: `${i18next.t("login:Auto sign in")} - ${i18next.t("general:True")}`},
+              {id: "Auto sign in - False", name: `${i18next.t("login:Auto sign in")} - ${i18next.t("general:False")}`},
+            ];
+          }
+
           if (options.length === 0) {
             return null;
           }