feat: handle the dataSourceName when DB changes (#1352)

* fix: handle the dataSourceName when DB changes

* reduce duplication of code

authz/authz.go

@@ -32,7 +32,9 @@ func InitAuthz() {
 	var err error
 
 	tableNamePrefix := conf.GetConfigString("tableNamePrefix")
-	a, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName()+conf.GetConfigString("dbName"), "casbin_rule", tableNamePrefix, true)
+	driverName := conf.GetConfigString("driverName")
+	dataSourceName := conf.GetConfigRealDataSourceName(driverName)
+	a, err := xormadapter.NewAdapterWithTableName(driverName, dataSourceName, "casbin_rule", tableNamePrefix, true)
 	if err != nil {
 		panic(err)
 	}

conf/app.conf

@@ -21,3 +21,4 @@ isDemoMode = false
 batchSize = 100
 ldapServerPort = 389
 languages = en,zh,es,fr,de,ja,ko,ru
+quota = {"organization": -1, "user": -1, "application": -1, "provider": -1}

conf/conf.go

@@ -15,6 +15,7 @@
 package conf
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"runtime"
@@ -24,6 +25,15 @@ import (
 	"github.com/beego/beego"
 )
 
+type Quota struct {
+	Organization int `json:"organization"`
+	User         int `json:"user"`
+	Application  int `json:"application"`
+	Provider     int `json:"provider"`
+}
+
+var quota = &Quota{-1, -1, -1, -1}
+
 func init() {
 	// this array contains the beego configuration items that may be modified via env
 	presetConfigItems := []string{"httpport", "appname"}
@@ -35,6 +45,17 @@ func init() {
 			}
 		}
 	}
+	initQuota()
+}
+
+func initQuota() {
+	res := beego.AppConfig.String("quota")
+	if res != "" {
+		err := json.Unmarshal([]byte(res), quota)
+		if err != nil {
+			panic(err)
+		}
+	}
 }
 
 func GetConfigString(key string) string {
@@ -95,3 +116,17 @@ func GetConfigBatchSize() int {
 	}
 	return res
 }
+
+func GetConfigQuota() *Quota {
+	return quota
+}
+
+func GetConfigRealDataSourceName(driverName string) string {
+	var dataSourceName string
+	if driverName != "mysql" {
+		dataSourceName = GetConfigDataSourceName()
+	} else {
+		dataSourceName = GetConfigDataSourceName() + GetConfigString("dbName")
+	}
+	return dataSourceName
+}

conf/conf_test.go

@@ -93,3 +93,19 @@ func TestGetConfBool(t *testing.T) {
 		})
 	}
 }
+
+func TestGetConfigQuota(t *testing.T) {
+	scenarios := []struct {
+		description string
+		expected    *Quota
+	}{
+		{"default", &Quota{-1, -1, -1, -1}},
+	}
+
+	err := beego.LoadAppConfig("ini", "app.conf")
+	assert.Nil(t, err)
+	for _, scenery := range scenarios {
+		quota := GetConfigQuota()
+		assert.Equal(t, scenery.expected, quota)
+	}
+}

controllers/application.go

@@ -167,6 +167,12 @@ func (c *ApiController) AddApplication() {
 		return
 	}
 
+	count := object.GetApplicationCount("", "", "")
+	if err := checkQuotaForApplication(count); err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+
 	c.Data["json"] = wrapActionResponse(object.AddApplication(&application))
 	c.ServeJSON()
 }

controllers/organization.go

@@ -99,6 +99,12 @@ func (c *ApiController) AddOrganization() {
 		return
 	}
 
+	count := object.GetOrganizationCount("", "", "")
+	if err := checkQuotaForOrganization(count); err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+
 	c.Data["json"] = wrapActionResponse(object.AddOrganization(&organization))
 	c.ServeJSON()
 }

controllers/permission.go

@@ -65,6 +65,20 @@ func (c *ApiController) GetPermissionsBySubmitter() {
 	return
 }
 
+// GetPermissionsByRole
+// @Title GetPermissionsByRole
+// @Tag Permission API
+// @Description get permissions by role
+// @Param   id    query    string  true        "The id of the role"
+// @Success 200 {array} object.Permission The Response object
+// @router /get-permissions-by-role [get]
+func (c *ApiController) GetPermissionsByRole() {
+	id := c.Input().Get("id")
+	permissions := object.GetPermissionsByRole(id)
+	c.ResponseOk(permissions, len(permissions))
+	return
+}
+
 // GetPermission
 // @Title GetPermission
 // @Tag Permission API

controllers/provider.go

@@ -122,6 +122,12 @@ func (c *ApiController) AddProvider() {
 		return
 	}
 
+	count := object.GetProviderCount("", "", "")
+	if err := checkQuotaForProvider(count); err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+
 	c.Data["json"] = wrapActionResponse(object.AddProvider(&provider))
 	c.ServeJSON()
 }

controllers/user.go

@@ -183,6 +183,12 @@ func (c *ApiController) AddUser() {
 		return
 	}
 
+	count := object.GetUserCount("", "", "")
+	if err := checkQuotaForUser(count); err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+
 	msg := object.CheckUsername(user.Name, c.GetAcceptLanguage())
 	if msg != "" {
 		c.ResponseError(msg)

controllers/util.go

@@ -153,3 +153,47 @@ func (c *ApiController) GetProviderFromContext(category string) (*object.Provide
 
 	return provider, user, true
 }
+
+func checkQuotaForApplication(count int) error {
+	quota := conf.GetConfigQuota().Application
+	if quota == -1 {
+		return nil
+	}
+	if count >= quota {
+		return fmt.Errorf("application quota is exceeded")
+	}
+	return nil
+}
+
+func checkQuotaForOrganization(count int) error {
+	quota := conf.GetConfigQuota().Organization
+	if quota == -1 {
+		return nil
+	}
+	if count >= quota {
+		return fmt.Errorf("organization quota is exceeded")
+	}
+	return nil
+}
+
+func checkQuotaForProvider(count int) error {
+	quota := conf.GetConfigQuota().Provider
+	if quota == -1 {
+		return nil
+	}
+	if count >= quota {
+		return fmt.Errorf("provider quota is exceeded")
+	}
+	return nil
+}
+
+func checkQuotaForUser(count int) error {
+	quota := conf.GetConfigQuota().User
+	if quota == -1 {
+		return nil
+	}
+	if count >= quota {
+		return fmt.Errorf("user quota is exceeded")
+	}
+	return nil
+}

controllers/verification.go

@@ -92,6 +92,10 @@ func (c *ApiController) SendVerificationCode() {
 	user := c.getCurrentUser()
 	application := object.GetApplication(applicationId)
 	organization := object.GetOrganization(fmt.Sprintf("%s/%s", application.Owner, application.Organization))
+	if organization == nil {
+		c.ResponseError(c.T("OrgErr.DoNotExist"))
+		return
+	}
 
 	if checkUser == "true" && user == nil && object.GetUserByFields(organization.Name, dest) == nil {
 		c.ResponseError(c.T("LoginErr.LoginFirst"))
@@ -114,6 +118,12 @@ func (c *ApiController) SendVerificationCode() {
 			return
 		}
 
+		userByEmail := object.GetUserByEmail(organization.Name, dest)
+		if userByEmail == nil {
+			c.ResponseError(c.T("UserErr.DoNotExistSignUp"))
+			return
+		}
+
 		provider := application.GetEmailProvider()
 		sendResp = object.SendVerificationCodeToEmail(organization, user, provider, remoteAddr, dest)
 	case "phone":
@@ -124,8 +134,10 @@ func (c *ApiController) SendVerificationCode() {
 			c.ResponseError(c.T("PhoneErr.NumberInvalid"))
 			return
 		}
-		if organization == nil {
-			c.ResponseError(c.T("OrgErr.DoNotExist"))
+
+		userByPhone := object.GetUserByPhone(organization.Name, dest)
+		if userByPhone == nil {
+			c.ResponseError(c.T("UserErr.DoNotExistSignUp"))
 			return
 		}
 

controllers/webauthn.go

@@ -104,6 +104,11 @@ func (c *ApiController) WebAuthnSigninBegin() {
 		c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExistInOrg"), userOwner, userName))
 		return
 	}
+	if len(user.WebauthnCredentials) == 0 {
+		c.ResponseError(c.T("UserErr.NoWebAuthnCredential"))
+		return
+	}
+
 	options, sessionData, err := webauthnObj.BeginLogin(user)
 	if err != nil {
 		c.ResponseError(err.Error())

i18n/generate.go

@@ -83,7 +83,7 @@ func parseToData() *I18nData {
 
 	data := I18nData{}
 	for _, word := range allWords {
-		tokens := strings.Split(word, ":")
+		tokens := strings.SplitN(word, ":", 2)
 		namespace := tokens[0]
 		key := tokens[1]
 

i18n/languages/locale_de.ini

@@ -134,4 +134,5 @@ NameTooLang = Username is too long (maximum is 39 characters).
 NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
 PasswordLessThanSixCharacters = Password must have at least 6 characters
 InvalidInformation = Invalid information
+NoWebAuthnCredential = Found no credentials for this user
 

i18n/languages/locale_en.ini

@@ -134,4 +134,5 @@ NameTooLang = Username is too long (maximum is 39 characters).
 NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
 PasswordLessThanSixCharacters = Password must have at least 6 characters
 InvalidInformation = Invalid information
+NoWebAuthnCredential = Found no credentials for this user
 

i18n/languages/locale_es.ini

@@ -134,4 +134,5 @@ NameTooLang = Username is too long (maximum is 39 characters).
 NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
 PasswordLessThanSixCharacters = Password must have at least 6 characters
 InvalidInformation = Invalid information
+NoWebAuthnCredential = Found no credentials for this user
 

i18n/languages/locale_fr.ini

@@ -134,4 +134,5 @@ NameTooLang = Username is too long (maximum is 39 characters).
 NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
 PasswordLessThanSixCharacters = Password must have at least 6 characters
 InvalidInformation = Invalid information
+NoWebAuthnCredential = Found no credentials for this user
 

i18n/languages/locale_ja.ini

@@ -134,4 +134,5 @@ NameTooLang = Username is too long (maximum is 39 characters).
 NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
 PasswordLessThanSixCharacters = Password must have at least 6 characters
 InvalidInformation = Invalid information
+NoWebAuthnCredential = Found no credentials for this user
 

i18n/languages/locale_ko.ini

@@ -134,4 +134,5 @@ NameTooLang = Username is too long (maximum is 39 characters).
 NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
 PasswordLessThanSixCharacters = Password must have at least 6 characters
 InvalidInformation = Invalid information
+NoWebAuthnCredential = Found no credentials for this user
 

i18n/languages/locale_ru.ini

@@ -134,4 +134,5 @@ NameTooLang = Username is too long (maximum is 39 characters).
 NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
 PasswordLessThanSixCharacters = Password must have at least 6 characters
 InvalidInformation = Invalid information
+NoWebAuthnCredential = Found no credentials for this user
 

i18n/languages/locale_zh.ini

@@ -1,5 +1,5 @@
 [ApplicationErr]
-AppNotFound = 应用 %%s 未找到
+AppNotFound = 应用 %s 未找到
 AppNotFoundForUserID = 找不到该用户的应用程序 %s
 GrantTypeNotSupport = 此应用中不支持此授权类型
 HasNoProviders = 该应用无提供商
@@ -25,7 +25,7 @@ EmptyErr = 邮箱不可为空
 EmailInvalid = 无效邮箱
 EmailCheckResult = Email: %s
 EmptyParam = 邮件参数为空: %v
-InvalidReceivers = 无效的邮箱接收者: %%s
+InvalidReceivers = 无效的邮箱接收者: %s
 UnableGetModifyRule = 无法得到Email修改规则
 
 [EnforcerErr]
@@ -131,6 +131,7 @@ NameFormatErr = 用户名只能包含字母数字字符、下划线或连字符
 PasswordLessThanSixCharacters = 密码至少为6字符
 DoNotExistSignUp = 用户不存在，请先注册
 InvalidInformation = 无效信息
+NoWebAuthnCredential = 该用户没有WebAuthn凭据
 
 [StorageErr]
 ObjectKeyNotAllowed = object key :%s 不被允许

object/permission_enforcer.go

@@ -29,7 +29,9 @@ func getEnforcer(permission *Permission) *casbin.Enforcer {
 		tableName = permission.Adapter
 	}
 	tableNamePrefix := conf.GetConfigString("tableNamePrefix")
-	adapter, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName()+conf.GetConfigString("dbName"), tableName, tableNamePrefix, true)
+	driverName := conf.GetConfigString("driverName")
+	dataSourceName := conf.GetConfigRealDataSourceName(driverName)
+	adapter, err := xormadapter.NewAdapterWithTableName(driverName, dataSourceName, tableName, tableNamePrefix, true)
 	if err != nil {
 		panic(err)
 	}

routers/router.go

@@ -82,6 +82,7 @@ func initAPI() {
 
 	beego.Router("/api/get-permissions", &controllers.ApiController{}, "GET:GetPermissions")
 	beego.Router("/api/get-permissions-by-submitter", &controllers.ApiController{}, "GET:GetPermissionsBySubmitter")
+	beego.Router("/api/get-permissions-by-role", &controllers.ApiController{}, "GET:GetPermissionsByRole")
 	beego.Router("/api/get-permission", &controllers.ApiController{}, "GET:GetPermission")
 	beego.Router("/api/update-permission", &controllers.ApiController{}, "POST:UpdatePermission")
 	beego.Router("/api/add-permission", &controllers.ApiController{}, "POST:AddPermission")

web/src/AdapterEditPage.js

@@ -263,8 +263,8 @@ class AdapterEditPage extends React.Component {
     const adapter = Setting.deepCopy(this.state.adapter);
     AdapterBackend.updateAdapter(this.state.adapter.owner, this.state.adapterName, adapter)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             adapterName: this.state.adapter.name,
           });
@@ -275,22 +275,26 @@ class AdapterEditPage extends React.Component {
             this.props.history.push(`/adapters/${this.state.owner}/${this.state.adapter.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateAdapterField("name", this.state.adapterName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteAdapter() {
     AdapterBackend.deleteAdapter(this.state.adapter)
-      .then(() => {
-        this.props.history.push("/adapters");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/adapters");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `adapter failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/AdapterListPage.js

@@ -45,26 +45,33 @@ class AdapterListPage extends BaseListPage {
     const newAdapter = this.newAdapter();
     AdapterBackend.addAdapter(newAdapter)
       .then((res) => {
-        this.props.history.push({pathname: `/adapters/${newAdapter.organization}/${newAdapter.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/adapters/${newAdapter.organization}/${newAdapter.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Adapter failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteAdapter(i) {
     AdapterBackend.deleteAdapter(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Adapter deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Adapter failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ApplicationEditPage.js

@@ -49,6 +49,9 @@ const template = `<style>
 }
 </style>`;
 
+const previewGrid = Setting.isMobile() ? 22 : 11;
+const previewWidth = Setting.isMobile() ? "110%" : "90%";
+
 const sideTemplate = `<style>
   .left-model{
     text-align: center;
@@ -188,7 +191,7 @@ class ApplicationEditPage extends React.Component {
           Setting.showMessage("success", i18next.t("application:File uploaded successfully"));
           this.updateApplicationField("termsOfUse", res.data);
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
         }
       }).finally(() => {
         this.setState({uploading: false});
@@ -720,7 +723,7 @@ class ApplicationEditPage extends React.Component {
 
     return (
       <React.Fragment>
-        <Col span={11}>
+        <Col span={previewGrid}>
           <Button style={{marginBottom: "10px"}} type="primary" shape="round" icon={<CopyOutlined />} onClick={() => {
             copy(`${window.location.origin}${signUpUrl}`);
             Setting.showMessage("success", i18next.t("application:Signup page URL copied to clipboard successfully, please paste it into the incognito window or another browser"));
@@ -729,7 +732,7 @@ class ApplicationEditPage extends React.Component {
             {i18next.t("application:Copy signup page URL")}
           </Button>
           <br />
-          <div style={{position: "relative", width: "90%", border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", alignItems: "center", overflow: "auto", flexDirection: "column", flex: "auto"}}>
+          <div style={{position: "relative", width: previewWidth, border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", alignItems: "center", overflow: "auto", flexDirection: "column", flex: "auto"}}>
             {
               this.state.application.enablePassword ? (
                 <SignupPage application={this.state.application} />
@@ -740,8 +743,8 @@ class ApplicationEditPage extends React.Component {
             <div style={maskStyle} />
           </div>
         </Col>
-        <Col span={11}>
-          <Button style={{marginBottom: "10px"}} type="primary" shape="round" icon={<CopyOutlined />} onClick={() => {
+        <Col span={previewGrid}>
+          <Button style={{marginBottom: "10px", marginTop: Setting.isMobile() ? "15px" : "0"}} type="primary" shape="round" icon={<CopyOutlined />} onClick={() => {
             copy(`${window.location.origin}${signInUrl}`);
             Setting.showMessage("success", i18next.t("application:Signin page URL copied to clipboard successfully, please paste it into the incognito window or another browser"));
           }}
@@ -749,7 +752,7 @@ class ApplicationEditPage extends React.Component {
             {i18next.t("application:Copy signin page URL")}
           </Button>
           <br />
-          <div style={{position: "relative", width: "90%", border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", alignItems: "center", overflow: "auto", flexDirection: "column", flex: "auto"}}>
+          <div style={{position: "relative", width: previewWidth, border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", alignItems: "center", overflow: "auto", flexDirection: "column", flex: "auto"}}>
             <LoginPage type={"login"} mode={"signin"} application={this.state.application} />
             <div style={maskStyle} />
           </div>
@@ -762,7 +765,7 @@ class ApplicationEditPage extends React.Component {
     const promptUrl = `/prompt/${this.state.application.name}`;
     const maskStyle = {position: "absolute", top: "0px", left: "0px", zIndex: 10, height: "100%", width: "100%", background: "rgba(0,0,0,0.4)"};
     return (
-      <Col span={11}>
+      <Col span={previewGrid}>
         <Button style={{marginBottom: "10px"}} type="primary" shape="round" icon={<CopyOutlined />} onClick={() => {
           copy(`${window.location.origin}${promptUrl}`);
           Setting.showMessage("success", i18next.t("application:Prompt page URL copied to clipboard successfully, please paste it into the incognito window or another browser"));
@@ -771,7 +774,7 @@ class ApplicationEditPage extends React.Component {
           {i18next.t("application:Copy prompt page URL")}
         </Button>
         <br />
-        <div style={{position: "relative", width: "90%", border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", flexDirection: "column", flex: "auto"}}>
+        <div style={{position: "relative", width: previewWidth, border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", flexDirection: "column", flex: "auto"}}>
           <PromptPage application={this.state.application} account={this.props.account} />
           <div style={maskStyle} />
         </div>
@@ -783,8 +786,8 @@ class ApplicationEditPage extends React.Component {
     const application = Setting.deepCopy(this.state.application);
     ApplicationBackend.updateApplication("admin", this.state.applicationName, application)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             applicationName: this.state.application.name,
           });
@@ -795,22 +798,26 @@ class ApplicationEditPage extends React.Component {
             this.props.history.push(`/applications/${this.state.application.organization}/${this.state.application.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateApplicationField("name", this.state.applicationName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteApplication() {
     ApplicationBackend.deleteApplication(this.state.application)
-      .then(() => {
-        this.props.history.push("/applications");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/applications");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Application failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ApplicationListPage.js

@@ -78,26 +78,33 @@ class ApplicationListPage extends BaseListPage {
     const newApplication = this.newApplication();
     ApplicationBackend.addApplication(newApplication)
       .then((res) => {
-        this.props.history.push({pathname: `/applications/${newApplication.organization}/${newApplication.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/applications/${newApplication.organization}/${newApplication.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Application failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteApplication(i) {
     ApplicationBackend.deleteApplication(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Application deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Application failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/CertEditPage.js

@@ -217,8 +217,8 @@ class CertEditPage extends React.Component {
     const cert = Setting.deepCopy(this.state.cert);
     CertBackend.updateCert(this.state.cert.owner, this.state.certName, cert)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             certName: this.state.cert.name,
           });
@@ -229,22 +229,26 @@ class CertEditPage extends React.Component {
             this.props.history.push(`/certs/${this.state.cert.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateCertField("name", this.state.certName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteCert() {
     CertBackend.deleteCert(this.state.cert)
-      .then(() => {
-        this.props.history.push("/certs");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/certs");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Cert failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/CertListPage.js

@@ -43,26 +43,33 @@ class CertListPage extends BaseListPage {
     const newCert = this.newCert();
     CertBackend.addCert(newCert)
       .then((res) => {
-        this.props.history.push({pathname: `/certs/${newCert.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/certs/${newCert.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Cert failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteCert(i) {
     CertBackend.deleteCert(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Cert deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Cert failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/LdapTable.js

@@ -81,7 +81,7 @@ class LdapTable extends React.Component {
           table = Setting.deleteRow(table, i);
           this.updateTable(table);
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
         }
       }
       )

web/src/ModelEditPage.js

@@ -158,8 +158,8 @@ class ModelEditPage extends React.Component {
     const model = Setting.deepCopy(this.state.model);
     ModelBackend.updateModel(this.state.organizationName, this.state.modelName, model)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             modelName: this.state.model.name,
           });
@@ -170,22 +170,26 @@ class ModelEditPage extends React.Component {
             this.props.history.push(`/models/${this.state.model.owner}/${this.state.model.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateModelField("name", this.state.modelName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteModel() {
     ModelBackend.deleteModel(this.state.model)
-      .then(() => {
-        this.props.history.push("/models");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/models");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Model failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ModelListPage.js

@@ -38,26 +38,33 @@ class ModelListPage extends BaseListPage {
     const newModel = this.newModel();
     ModelBackend.addModel(newModel)
       .then((res) => {
-        this.props.history.push({pathname: `/models/${newModel.owner}/${newModel.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/models/${newModel.owner}/${newModel.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Model failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteModel(i) {
     ModelBackend.deleteModel(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Model deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Model failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/OrganizationEditPage.js

@@ -335,8 +335,8 @@ class OrganizationEditPage extends React.Component {
     const organization = Setting.deepCopy(this.state.organization);
     OrganizationBackend.updateOrganization(this.state.organization.owner, this.state.organizationName, organization)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             organizationName: this.state.organization.name,
           });
@@ -347,22 +347,26 @@ class OrganizationEditPage extends React.Component {
             this.props.history.push(`/organizations/${this.state.organization.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateOrganizationField("name", this.state.organizationName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteOrganization() {
     OrganizationBackend.deleteOrganization(this.state.organization)
-      .then(() => {
-        this.props.history.push("/organizations");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/organizations");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/OrganizationListPage.js

@@ -75,26 +75,33 @@ class OrganizationListPage extends BaseListPage {
     const newOrganization = this.newOrganization();
     OrganizationBackend.addOrganization(newOrganization)
       .then((res) => {
-        this.props.history.push({pathname: `/organizations/${newOrganization.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/organizations/${newOrganization.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Organization failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteOrganization(i) {
     OrganizationBackend.deleteOrganization(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Organization deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Organization failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/PaymentEditPage.js

@@ -78,7 +78,7 @@ class PaymentEditPage extends React.Component {
         this.setState({
           isInvoiceLoading: false,
         });
-        if (res.msg === "") {
+        if (res.status === "ok") {
           Setting.showMessage("success", "Successfully invoiced");
           Setting.openLinkSafe(res.data);
           this.getPayment();
@@ -90,7 +90,7 @@ class PaymentEditPage extends React.Component {
         this.setState({
           isInvoiceLoading: false,
         });
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
@@ -443,8 +443,8 @@ class PaymentEditPage extends React.Component {
     const payment = Setting.deepCopy(this.state.payment);
     PaymentBackend.updatePayment(this.state.payment.owner, this.state.paymentName, payment)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             paymentName: this.state.payment.name,
           });
@@ -455,22 +455,26 @@ class PaymentEditPage extends React.Component {
             this.props.history.push(`/payments/${this.state.payment.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updatePaymentField("name", this.state.paymentName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deletePayment() {
     PaymentBackend.deletePayment(this.state.payment)
-      .then(() => {
-        this.props.history.push("/payments");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/payments");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Payment failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/PaymentListPage.js

@@ -51,26 +51,34 @@ class PaymentListPage extends BaseListPage {
     const newPayment = this.newPayment();
     PaymentBackend.addPayment(newPayment)
       .then((res) => {
-        this.props.history.push({pathname: `/payments/${newPayment.name}`, mode: "add"});
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/payments/${newPayment.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
       }
       )
       .catch(error => {
-        Setting.showMessage("error", `Payment failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deletePayment(i) {
     PaymentBackend.deletePayment(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Payment deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Payment failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/PermissionEditPage.js

@@ -417,8 +417,8 @@ class PermissionEditPage extends React.Component {
     const permission = Setting.deepCopy(this.state.permission);
     PermissionBackend.updatePermission(this.state.organizationName, this.state.permissionName, permission)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             permissionName: this.state.permission.name,
           });
@@ -429,22 +429,26 @@ class PermissionEditPage extends React.Component {
             this.props.history.push(`/permissions/${this.state.permission.owner}/${this.state.permission.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updatePermissionField("name", this.state.permissionName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deletePermission() {
     PermissionBackend.deletePermission(this.state.permission)
-      .then(() => {
-        this.props.history.push("/permissions");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/permissions");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Permission failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/PermissionListPage.js

@@ -48,30 +48,33 @@ class PermissionListPage extends BaseListPage {
     const newPermission = this.newPermission();
     PermissionBackend.addPermission(newPermission)
       .then((res) => {
-        if (res.msg !== "") {
-          Setting.showMessage("error", res.msg);
-          return;
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/permissions/${newPermission.owner}/${newPermission.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
         }
-        this.props.history.push({pathname: `/permissions/${newPermission.owner}/${newPermission.name}`, mode: "add"});
-      }
-      )
+      })
       .catch(error => {
-        Setting.showMessage("error", `Permission failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deletePermission(i) {
     PermissionBackend.deletePermission(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Permission deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Permission failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ProductBuyPage.js

@@ -81,11 +81,11 @@ class ProductBuyPage extends React.Component {
 
     ProductBackend.buyProduct(this.state.product.owner, this.state.productName, provider.name)
       .then((res) => {
-        if (res.msg === "") {
+        if (res.status === "ok") {
           const payUrl = res.data;
           Setting.goToLink(payUrl);
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
 
           this.setState({
             isPlacingOrder: false,
@@ -93,7 +93,7 @@ class ProductBuyPage extends React.Component {
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ProductEditPage.js

@@ -271,8 +271,8 @@ class ProductEditPage extends React.Component {
     const product = Setting.deepCopy(this.state.product);
     ProductBackend.updateProduct(this.state.product.owner, this.state.productName, product)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             productName: this.state.product.name,
           });
@@ -283,22 +283,26 @@ class ProductEditPage extends React.Component {
             this.props.history.push(`/products/${this.state.product.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateProductField("name", this.state.productName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteProduct() {
     ProductBackend.deleteProduct(this.state.product)
-      .then(() => {
-        this.props.history.push("/products");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/products");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Product failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ProductListPage.js

@@ -45,26 +45,33 @@ class ProductListPage extends BaseListPage {
     const newProduct = this.newProduct();
     ProductBackend.addProduct(newProduct)
       .then((res) => {
-        this.props.history.push({pathname: `/products/${newProduct.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/products/${newProduct.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Product failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteProduct(i) {
     ProductBackend.deleteProduct(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Product deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Product failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ProviderEditPage.js

@@ -257,7 +257,9 @@ class ProviderEditPage extends React.Component {
                   {id: "SAML", name: "SAML"},
                   {id: "Payment", name: "Payment"},
                   {id: "Captcha", name: "Captcha"},
-                ].map((providerCategory, index) => <Option key={index} value={providerCategory.id}>{providerCategory.name}</Option>)
+                ]
+                  .sort((a, b) => a.name.localeCompare(b.name))
+                  .map((providerCategory, index) => <Option key={index} value={providerCategory.id}>{providerCategory.name}</Option>)
               }
             </Select>
           </Col>
@@ -280,7 +282,9 @@ class ProviderEditPage extends React.Component {
               }
             })}>
               {
-                Setting.getProviderTypeOptions(this.state.provider.category).map((providerType, index) => <Option key={index} value={providerType.id}>{providerType.name}</Option>)
+                Setting.getProviderTypeOptions(this.state.provider.category)
+                  .sort((a, b) => a.name.localeCompare(b.name))
+                  .map((providerType, index) => <Option key={index} value={providerType.id}>{providerType.name}</Option>)
               }
             </Select>
           </Col>
@@ -789,8 +793,8 @@ class ProviderEditPage extends React.Component {
     const provider = Setting.deepCopy(this.state.provider);
     ProviderBackend.updateProvider(this.state.owner, this.state.providerName, provider)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             owner: this.state.provider.owner,
             providerName: this.state.provider.name,
@@ -802,22 +806,26 @@ class ProviderEditPage extends React.Component {
             this.props.history.push(`/providers/${this.state.provider.owner}/${this.state.provider.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateProviderField("name", this.state.providerName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteProvider() {
     ProviderBackend.deleteProvider(this.state.provider)
-      .then(() => {
-        this.props.history.push("/providers");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/providers");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Provider failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ProviderListPage.js

@@ -61,26 +61,33 @@ class ProviderListPage extends BaseListPage {
     const newProvider = this.newProvider();
     ProviderBackend.addProvider(newProvider)
       .then((res) => {
-        this.props.history.push({pathname: `/providers/${newProvider.owner}/${newProvider.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/providers/${newProvider.owner}/${newProvider.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Provider failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteProvider(i) {
     ProviderBackend.deleteProvider(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Provider deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Provider failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/ResourceListPage.js

@@ -43,15 +43,18 @@ class ResourceListPage extends BaseListPage {
   deleteResource(i) {
     ResourceBackend.deleteResource(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Resource deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Resource failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/RoleEditPage.js

@@ -196,8 +196,8 @@ class RoleEditPage extends React.Component {
     const role = Setting.deepCopy(this.state.role);
     RoleBackend.updateRole(this.state.organizationName, this.state.roleName, role)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             roleName: this.state.role.name,
           });
@@ -208,22 +208,26 @@ class RoleEditPage extends React.Component {
             this.props.history.push(`/roles/${this.state.role.owner}/${this.state.role.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateRoleField("name", this.state.roleName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteRole() {
     RoleBackend.deleteRole(this.state.role)
-      .then(() => {
-        this.props.history.push("/roles");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/roles");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Role failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/RoleListPage.js

@@ -40,26 +40,33 @@ class RoleListPage extends BaseListPage {
     const newRole = this.newRole();
     RoleBackend.addRole(newRole)
       .then((res) => {
-        this.props.history.push({pathname: `/roles/${newRole.owner}/${newRole.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/roles/${newRole.owner}/${newRole.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Role failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteRole(i) {
     RoleBackend.deleteRole(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Role deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Role failed to delete: ${error}`);
+
       });
   }
 

web/src/SyncerEditPage.js

@@ -298,8 +298,8 @@ class SyncerEditPage extends React.Component {
     const syncer = Setting.deepCopy(this.state.syncer);
     SyncerBackend.updateSyncer(this.state.syncer.owner, this.state.syncerName, syncer)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             syncerName: this.state.syncer.name,
           });
@@ -310,22 +310,26 @@ class SyncerEditPage extends React.Component {
             this.props.history.push(`/syncers/${this.state.syncer.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateSyncerField("name", this.state.syncerName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteSyncer() {
     SyncerBackend.deleteSyncer(this.state.syncer)
-      .then(() => {
-        this.props.history.push("/syncers");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/syncers");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Syncer failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/SyncerListPage.js

@@ -49,26 +49,33 @@ class SyncerListPage extends BaseListPage {
     const newSyncer = this.newSyncer();
     SyncerBackend.addSyncer(newSyncer)
       .then((res) => {
-        this.props.history.push({pathname: `/syncers/${newSyncer.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/syncers/${newSyncer.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Syncer failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteSyncer(i) {
     SyncerBackend.deleteSyncer(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Syncer deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Syncer failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/TestEmailWidget.js

@@ -13,32 +13,33 @@
 // limitations under the License.
 
 import * as Setting from "./Setting";
+import i18next from "i18next";
 
 export function sendTestEmail(provider, email) {
   testEmailProvider(provider, email)
     .then((res) => {
-      if (res.msg === "") {
+      if (res.status === "ok") {
         Setting.showMessage("success", "Successfully send email");
       } else {
         Setting.showMessage("error", res.msg);
       }
     })
     .catch(error => {
-      Setting.showMessage("error", `Failed to connect to server: ${error}`);
+      Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
     });
 }
 
 export function connectSmtpServer(provider) {
   testEmailProvider(provider)
     .then((res) => {
-      if (res.msg === "") {
+      if (res.status === "ok") {
         Setting.showMessage("success", "Successfully connecting smtp server");
       } else {
         Setting.showMessage("error", res.msg);
       }
     })
     .catch(error => {
-      Setting.showMessage("error", `Failed to connect to server: ${error}`);
+      Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
     });
 }
 

web/src/TokenEditPage.js

@@ -167,8 +167,8 @@ class TokenEditPage extends React.Component {
     const token = Setting.deepCopy(this.state.token);
     TokenBackend.updateToken(this.state.token.owner, this.state.tokenName, token)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             tokenName: this.state.token.name,
           });
@@ -179,22 +179,26 @@ class TokenEditPage extends React.Component {
             this.props.history.push(`/tokens/${this.state.token.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateTokenField("name", this.state.tokenName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteToken() {
     TokenBackend.deleteToken(this.state.token)
-      .then(() => {
-        this.props.history.push("/tokens");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/tokens");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Token failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/TokenListPage.js

@@ -42,26 +42,33 @@ class TokenListPage extends BaseListPage {
     const newToken = this.newToken();
     TokenBackend.addToken(newToken)
       .then((res) => {
-        this.props.history.push({pathname: `/tokens/${newToken.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/tokens/${newToken.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Token failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteToken(i) {
     TokenBackend.deleteToken(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Token deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Token failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/UserEditPage.js

@@ -611,8 +611,8 @@ class UserEditPage extends React.Component {
     const user = Setting.deepCopy(this.state.user);
     UserBackend.updateUser(this.state.organizationName, this.state.userName, user)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             organizationName: this.state.user.owner,
             userName: this.state.user.name,
@@ -632,23 +632,27 @@ class UserEditPage extends React.Component {
             }
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateUserField("owner", this.state.organizationName);
           this.updateUserField("name", this.state.userName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteUser() {
     UserBackend.deleteUser(this.state.user)
-      .then(() => {
-        this.props.history.push("/users");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/users");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `User failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/UserListPage.js

@@ -72,26 +72,33 @@ class UserListPage extends BaseListPage {
     const newUser = this.newUser();
     UserBackend.addUser(newUser)
       .then((res) => {
-        this.props.history.push({pathname: `/users/${newUser.owner}/${newUser.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/users/${newUser.owner}/${newUser.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `User failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteUser(i) {
     UserBackend.deleteUser(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "User deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `User failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/WebauthnCredentialTable.js

@@ -26,7 +26,7 @@ class WebAuthnCredentialTable extends React.Component {
 
   registerWebAuthn() {
     UserWebauthnBackend.registerWebauthnCredential().then((res) => {
-      if (res.msg === "") {
+      if (res.status === "ok") {
         Setting.showMessage("success", "Successfully added webauthn credentials");
       } else {
         Setting.showMessage("error", res.msg);
@@ -34,7 +34,7 @@ class WebAuthnCredentialTable extends React.Component {
 
       this.props.refresh();
     }).catch(error => {
-      Setting.showMessage("error", `Failed to connect to server: ${error}`);
+      Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
     });
   }
 

web/src/WebhookEditPage.js

@@ -296,8 +296,8 @@ class WebhookEditPage extends React.Component {
     const webhook = Setting.deepCopy(this.state.webhook);
     WebhookBackend.updateWebhook(this.state.webhook.owner, this.state.webhookName, webhook)
       .then((res) => {
-        if (res.msg === "") {
-          Setting.showMessage("success", "Successfully saved");
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully saved"));
           this.setState({
             webhookName: this.state.webhook.name,
           });
@@ -308,22 +308,26 @@ class WebhookEditPage extends React.Component {
             this.props.history.push(`/webhooks/${this.state.webhook.name}`);
           }
         } else {
-          Setting.showMessage("error", res.msg);
+          Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
           this.updateWebhookField("name", this.state.webhookName);
         }
       })
       .catch(error => {
-        Setting.showMessage("error", `Failed to connect to server: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteWebhook() {
     WebhookBackend.deleteWebhook(this.state.webhook)
-      .then(() => {
-        this.props.history.push("/webhooks");
+      .then((res) => {
+        if (res.status === "ok") {
+          this.props.history.push("/webhooks");
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
       })
       .catch(error => {
-        Setting.showMessage("error", `Webhook failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/WebhookListPage.js

@@ -42,26 +42,33 @@ class WebhookListPage extends BaseListPage {
     const newWebhook = this.newWebhook();
     WebhookBackend.addWebhook(newWebhook)
       .then((res) => {
-        this.props.history.push({pathname: `/webhooks/${newWebhook.name}`, mode: "add"});
-      }
-      )
+        if (res.status === "ok") {
+          this.props.history.push({pathname: `/webhooks/${newWebhook.name}`, mode: "add"});
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Webhook failed to add: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
   deleteWebhook(i) {
     WebhookBackend.deleteWebhook(this.state.data[i])
       .then((res) => {
-        Setting.showMessage("success", "Webhook deleted successfully");
-        this.setState({
-          data: Setting.deleteRow(this.state.data, i),
-          pagination: {total: this.state.pagination.total - 1},
-        });
-      }
-      )
+        if (res.status === "ok") {
+          Setting.showMessage("success", i18next.t("general:Successfully deleted"));
+          this.setState({
+            data: Setting.deleteRow(this.state.data, i),
+            pagination: {total: this.state.pagination.total - 1},
+          });
+        } else {
+          Setting.showMessage("error", `${i18next.t("general:Failed to delete")}: ${res.msg}`);
+        }
+      })
       .catch(error => {
-        Setting.showMessage("error", `Webhook failed to delete: ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 

web/src/auth/AuthCallback.js

@@ -126,7 +126,7 @@ class AuthCallback extends React.Component {
             // If service was not specified, Casdoor must display a message notifying the client that it has successfully initiated a single sign-on session.
             msg += "Now you can visit apps protected by Casdoor.";
           }
-          Util.showMessage("success", msg);
+          Setting.showMessage("success", msg);
 
           if (casService !== "") {
             const st = res.data;
@@ -135,7 +135,7 @@ class AuthCallback extends React.Component {
             window.location.href = newUrl.toString();
           }
         } else {
-          Util.showMessage("error", `Failed to log in: ${res.msg}`);
+          Setting.showMessage("error", `Failed to log in: ${res.msg}`);
         }
       });
       return;
@@ -148,7 +148,7 @@ class AuthCallback extends React.Component {
         if (res.status === "ok") {
           const responseType = this.getResponseType();
           if (responseType === "login") {
-            Util.showMessage("success", "Logged in successfully");
+            Setting.showMessage("success", "Logged in successfully");
             // Setting.goToLinkSoft(this, "/");
 
             const link = Setting.getFromLink();
@@ -156,7 +156,7 @@ class AuthCallback extends React.Component {
           } else if (responseType === "code") {
             const code = res.data;
             Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}code=${code}&state=${oAuthParams.state}`);
-            // Util.showMessage("success", `Authorization code: ${res.data}`);
+            // Setting.showMessage("success", `Authorization code: ${res.data}`);
           } else if (responseType === "token" || responseType === "id_token") {
             const token = res.data;
             Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}${responseType}=${token}&state=${oAuthParams.state}&token_type=bearer`);

web/src/auth/ForgetPage.js

@@ -61,10 +61,7 @@ class ForgetPage extends React.Component {
     if (this.state.applicationName !== undefined) {
       this.getApplication();
     } else {
-      Util.showMessage(
-        "error",
-        i18next.t("forget:Unknown forget type: ") + this.state.type
-      );
+      Setting.showMessage("error", i18next.t("forget:Unknown forget type: ") + this.state.type);
     }
   }
 

web/src/auth/LoginPage.js

@@ -67,7 +67,7 @@ class LoginPage extends React.Component {
     } else if (this.state.type === "saml") {
       this.getSamlApplication();
     } else {
-      Util.showMessage("error", `Unknown authentication type: ${this.state.type}`);
+      Setting.showMessage("error", `Unknown authentication type: ${this.state.type}`);
     }
   }
 
@@ -92,7 +92,7 @@ class LoginPage extends React.Component {
             application: res.data,
           });
         } else {
-          // Util.showMessage("error", res.msg);
+          // Setting.showMessage("error", res.msg);
           this.setState({
             application: res.data,
             msg: res.msg,
@@ -122,7 +122,7 @@ class LoginPage extends React.Component {
               applicationName: res.data.name,
             });
           } else {
-            Util.showMessage("error", res.msg);
+            Setting.showMessage("error", res.msg);
           }
         });
     }
@@ -269,7 +269,7 @@ class LoginPage extends React.Component {
             // If service was not specified, Casdoor must display a message notifying the client that it has successfully initiated a single sign-on session.
             msg += "Now you can visit apps protected by Casdoor.";
           }
-          Util.showMessage("success", msg);
+          Setting.showMessage("success", msg);
 
           this.setState({openCaptchaModal: false});
 
@@ -281,7 +281,7 @@ class LoginPage extends React.Component {
           }
         } else {
           this.setState({openCaptchaModal: false});
-          Util.showMessage("error", `Failed to log in: ${res.msg}`);
+          Setting.showMessage("error", `Failed to log in: ${res.msg}`);
         }
       });
     } else {
@@ -295,13 +295,13 @@ class LoginPage extends React.Component {
             const responseType = values["type"];
 
             if (responseType === "login") {
-              Util.showMessage("success", "Logged in successfully");
+              Setting.showMessage("success", "Logged in successfully");
 
               const link = Setting.getFromLink();
               Setting.goToLink(link);
             } else if (responseType === "code") {
               this.postCodeLoginAction(res);
-              // Util.showMessage("success", `Authorization code: ${res.data}`);
+              // Setting.showMessage("success", `Authorization code: ${res.data}`);
             } else if (responseType === "token" || responseType === "id_token") {
               const accessToken = res.data;
               Setting.goToLink(`${oAuthParams.redirectUri}#${responseType}=${accessToken}?state=${oAuthParams.state}&token_type=bearer`);
@@ -312,7 +312,7 @@ class LoginPage extends React.Component {
             }
           } else {
             this.setState({openCaptchaModal: false});
-            Util.showMessage("error", `Failed to log in: ${res.msg}`);
+            Setting.showMessage("error", `Failed to log in: ${res.msg}`);
           }
         });
     }
@@ -673,7 +673,7 @@ class LoginPage extends React.Component {
           }),
         })
           .then(res => res.json()).then((res) => {
-            if (res.msg === "") {
+            if (res.status === "ok") {
               const responseType = values["type"];
               if (responseType === "code") {
                 this.postCodeLoginAction(res);
@@ -689,7 +689,7 @@ class LoginPage extends React.Component {
             }
           })
           .catch(error => {
-            Setting.showMessage("error", `${i18next.t("application:Failed to connect to server: ")}${error}`);
+            Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}${error}`);
           });
       });
   }

web/src/auth/PromptPage.js

@@ -203,9 +203,9 @@ class PromptPage extends React.Component {
     const user = Setting.deepCopy(this.state.user);
     UserBackend.updateUser(this.state.user.owner, this.state.user.name, user)
       .then((res) => {
-        if (res.msg === "") {
+        if (res.status === "ok") {
           if (isFinal) {
-            Setting.showMessage("success", "Successfully saved");
+            Setting.showMessage("success", i18next.t("general:Successfully saved"));
 
             this.logout();
           }
@@ -217,7 +217,7 @@ class PromptPage extends React.Component {
       })
       .catch(error => {
         if (isFinal) {
-          Setting.showMessage("error", `Failed to connect to server: ${error}`);
+          Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
         }
       });
   }

web/src/auth/ResultPage.js

@@ -16,7 +16,6 @@ import React from "react";
 import {Button, Result} from "antd";
 import i18next from "i18next";
 import {authConfig} from "./Auth";
-import * as Util from "./Util";
 import * as ApplicationBackend from "../backend/ApplicationBackend";
 import * as Setting from "../Setting";
 
@@ -34,7 +33,7 @@ class ResultPage extends React.Component {
     if (this.state.applicationName !== undefined) {
       this.getApplication();
     } else {
-      Util.showMessage("error", `Unknown application name: ${this.state.applicationName}`);
+      Setting.showMessage("error", `Unknown application name: ${this.state.applicationName}`);
     }
   }
 

web/src/auth/SamlCallback.js

@@ -79,7 +79,7 @@ class SamlCallback extends React.Component {
         if (res.status === "ok") {
           const responseType = this.getResponseType(redirectUri);
           if (responseType === "login") {
-            Util.showMessage("success", "Logged in successfully");
+            Setting.showMessage("success", "Logged in successfully");
             Setting.goToLink("/");
           } else if (responseType === "code") {
             const code = res.data;

web/src/auth/SignupPage.js

@@ -94,7 +94,7 @@ class SignupPage extends React.Component {
     if (applicationName !== undefined) {
       this.getApplication(applicationName);
     } else {
-      Util.showMessage("error", `Unknown application name: ${applicationName}`);
+      Setting.showMessage("error", `Unknown application name: ${applicationName}`);
     }
   }
 

web/src/auth/Util.js

@@ -13,19 +13,11 @@
 // limitations under the License.
 
 import React from "react";
-import {Alert, Button, Result, message} from "antd";
+import {Alert, Button, Result} from "antd";
 import {getWechatMessageEvent} from "./AuthBackend";
 import * as Setting from "../Setting";
 import * as Provider from "./Provider";
 
-export function showMessage(type, text) {
-  if (type === "success") {
-    message.success(text);
-  } else if (type === "error") {
-    message.error(text);
-  }
-}
-
 export function renderMessage(msg) {
   if (msg !== null) {
     return (

web/src/common/PoliciyTable.js

@@ -90,16 +90,15 @@ class PolicyTable extends React.Component {
     this.setState({loading: true});
     AdapterBackend.syncPolicies(this.props.owner, this.props.name)
       .then((res) => {
-        if (res.status !== "error") {
-          this.setState({loading: false, policyLists: res});
+        if (res.status === "ok") {
+          this.setState({policyLists: res});
         } else {
-          this.setState({loading: false});
-          Setting.showMessage("error", `Adapter failed to get policies, ${res.msg}`);
+          Setting.showMessage("error", i18next.t("adapter:Failed to sync policies: ") + res.msg);
         }
+        this.setState({loading: false});
       })
       .catch(error => {
-        this.setState({loading: false});
-        Setting.showMessage("error", `Adapter failed to get policies, ${error}`);
+        Setting.showMessage("error", `${i18next.t("general:Failed to connect to server")}: ${error}`);
       });
   }
 
@@ -107,9 +106,9 @@ class PolicyTable extends React.Component {
     AdapterBackend.UpdatePolicy(this.props.owner, this.props.name, [this.state.oldPolicy, table[i]]).then(res => {
       if (res.status === "ok") {
         this.setState({editingIndex: "", oldPolicy: ""});
-        Setting.showMessage("success", i18next.t("adapter:Update policy successfully"));
+        Setting.showMessage("success", i18next.t("general:Successfully saved"));
       } else {
-        Setting.showMessage("error", i18next.t(`adapter:Update policy failed, ${res.msg}`));
+        Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);
       }
     });
   }
@@ -119,12 +118,12 @@ class PolicyTable extends React.Component {
       if (res.status === "ok") {
         this.setState({editingIndex: "", oldPolicy: "", add: false});
         if (res.data !== "Affected") {
-          Setting.showMessage("info", i18next.t("adapter:Repeated policy"));
+          Setting.showMessage("info", i18next.t("adapter:Repeated policy rules"));
         } else {
-          Setting.showMessage("success", i18next.t("adapter:Add policy successfully"));
+          Setting.showMessage("success", i18next.t("general:Successfully added"));
         }
       } else {
-        Setting.showMessage("error", i18next.t(`adapter:Add policy failed, ${res.msg}`));
+        Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
       }
     });
   }
@@ -134,9 +133,9 @@ class PolicyTable extends React.Component {
       if (res.status === "ok") {
         table = Setting.deleteRow(table, i);
         this.updateTable(table);
-        Setting.showMessage("success", i18next.t("adapter:Delete policy successfully"));
+        Setting.showMessage("success", i18next.t("general:Successfully deleted"));
       } else {
-        Setting.showMessage("error", i18next.t(`adapter:Delete policy failed, ${res.msg}`));
+        Setting.showMessage("error", i18next.t("general:Failed to delete"));
       }
     });
   }

web/src/i18n.js

@@ -89,7 +89,7 @@ i18n.use(initReactI18next).init({
   keySeparator: false,
 
   interpolation: {
-    escapeValue: false,
+    escapeValue: true,
   },
   // debug: true,
   saveMissing: true,

web/src/locales/de/data.json

@@ -6,15 +6,13 @@
     "Sign Up": "Registrieren"
   },
   "adapter": {
-    "Add policy successfully": "Add policy successfully",
-    "Delete policy successfully": "Delete policy successfully",
     "Edit Adapter": "Edit Adapter",
+    "Failed to sync policies: ": "Failed to sync policies: ",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
-    "Repeated policy": "Repeated policy",
-    "Sync": "Sync",
-    "Update policy successfully": "Update policy successfully"
+    "Repeated policy rules": "Repeated policy rules",
+    "Sync": "Sync"
   },
   "application": {
     "Always": "Always",
@@ -38,7 +36,6 @@
     "Enable signin session - Tooltip": "Aktiviere Anmeldesession - Tooltip",
     "Enable signup": "Anmeldung aktivieren",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
-    "Failed to connect to server": "Failed to connect to server",
     "File uploaded successfully": "Datei erfolgreich hochgeladen",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -128,7 +125,7 @@
     "Please input your username!": "Bitte geben Sie Ihren Benutzernamen ein!",
     "Reset": "Reset",
     "Retrieve password": "Passwort abrufen",
-    "Unknown forget type": "Unknown forget type",
+    "Unknown forget type: ": "Unknown forget type: ",
     "Verify": "Überprüfen"
   },
   "general": {
@@ -167,6 +164,10 @@
     "Edit": "Bearbeiten",
     "Email": "E-Mail",
     "Email - Tooltip": "email",
+    "Failed to add": "Failed to add",
+    "Failed to connect to server": "Failed to connect to server",
+    "Failed to delete": "Failed to delete",
+    "Failed to save": "Failed to save",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Application icon",
     "First name": "First name",
@@ -237,6 +238,9 @@
     "Sorry, you do not have permission to access this page.": "Sorry, you do not have permission to access this page.",
     "State": "State",
     "State - Tooltip": "State - Tooltip",
+    "Successfully added": "Successfully added",
+    "Successfully deleted": "Successfully deleted",
+    "Successfully saved": "Successfully saved",
     "Swagger": "Swagger",
     "Sync": "Sync",
     "Syncers": "Syncers",

web/src/locales/en/data.json

@@ -6,15 +6,13 @@
     "Sign Up": "Sign Up"
   },
   "adapter": {
-    "Add policy successfully": "Add policy successfully",
-    "Delete policy successfully": "Delete policy successfully",
     "Edit Adapter": "Edit Adapter",
+    "Failed to sync policies: ": "Failed to sync policies: ",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
-    "Repeated policy": "Repeated policy",
-    "Sync": "Sync",
-    "Update policy successfully": "Update policy successfully"
+    "Repeated policy rules": "Repeated policy rules",
+    "Sync": "Sync"
   },
   "application": {
     "Always": "Always",
@@ -38,7 +36,6 @@
     "Enable signin session - Tooltip": "Enable signin session - Tooltip",
     "Enable signup": "Enable signup",
     "Enable signup - Tooltip": "Enable signup - Tooltip",
-    "Failed to connect to server": "Failed to connect to server",
     "File uploaded successfully": "File uploaded successfully",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -128,7 +125,7 @@
     "Please input your username!": "Please input your username!",
     "Reset": "Reset",
     "Retrieve password": "Retrieve password",
-    "Unknown forget type": "Unknown forget type",
+    "Unknown forget type: ": "Unknown forget type: ",
     "Verify": "Verify"
   },
   "general": {
@@ -167,6 +164,10 @@
     "Edit": "Edit",
     "Email": "Email",
     "Email - Tooltip": "Email - Tooltip",
+    "Failed to add": "Failed to add",
+    "Failed to connect to server": "Failed to connect to server",
+    "Failed to delete": "Failed to delete",
+    "Failed to save": "Failed to save",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Favicon - Tooltip",
     "First name": "First name",
@@ -237,6 +238,9 @@
     "Sorry, you do not have permission to access this page.": "Sorry, you do not have permission to access this page.",
     "State": "State",
     "State - Tooltip": "State - Tooltip",
+    "Successfully added": "Successfully added",
+    "Successfully deleted": "Successfully deleted",
+    "Successfully saved": "Successfully saved",
     "Swagger": "Swagger",
     "Sync": "Sync",
     "Syncers": "Syncers",

web/src/locales/fr/data.json

@@ -6,15 +6,13 @@
     "Sign Up": "S'inscrire"
   },
   "adapter": {
-    "Add policy successfully": "Add policy successfully",
-    "Delete policy successfully": "Delete policy successfully",
     "Edit Adapter": "Edit Adapter",
+    "Failed to sync policies: ": "Failed to sync policies: ",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
-    "Repeated policy": "Repeated policy",
-    "Sync": "Sync",
-    "Update policy successfully": "Update policy successfully"
+    "Repeated policy rules": "Repeated policy rules",
+    "Sync": "Sync"
   },
   "application": {
     "Always": "Always",
@@ -38,7 +36,6 @@
     "Enable signin session - Tooltip": "Activer la session de connexion - infobulle",
     "Enable signup": "Activer l'inscription",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
-    "Failed to connect to server": "Failed to connect to server",
     "File uploaded successfully": "Fichier téléchargé avec succès",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -128,7 +125,7 @@
     "Please input your username!": "Veuillez entrer votre nom d'utilisateur !",
     "Reset": "Reset",
     "Retrieve password": "Récupérer le mot de passe",
-    "Unknown forget type": "Unknown forget type",
+    "Unknown forget type: ": "Unknown forget type: ",
     "Verify": "Vérifier"
   },
   "general": {
@@ -167,6 +164,10 @@
     "Edit": "Editer",
     "Email": "Courriel",
     "Email - Tooltip": "email",
+    "Failed to add": "Failed to add",
+    "Failed to connect to server": "Failed to connect to server",
+    "Failed to delete": "Failed to delete",
+    "Failed to save": "Failed to save",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Application icon",
     "First name": "First name",
@@ -237,6 +238,9 @@
     "Sorry, you do not have permission to access this page.": "Désolé, vous n'avez pas la permission d'accéder à cette page.",
     "State": "State",
     "State - Tooltip": "State - Tooltip",
+    "Successfully added": "Successfully added",
+    "Successfully deleted": "Successfully deleted",
+    "Successfully saved": "Successfully saved",
     "Swagger": "Swagger",
     "Sync": "Sync",
     "Syncers": "Synchronisateurs",

web/src/locales/ja/data.json

@@ -6,15 +6,13 @@
     "Sign Up": "新規登録"
   },
   "adapter": {
-    "Add policy successfully": "Add policy successfully",
-    "Delete policy successfully": "Delete policy successfully",
     "Edit Adapter": "Edit Adapter",
+    "Failed to sync policies: ": "Failed to sync policies: ",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
-    "Repeated policy": "Repeated policy",
-    "Sync": "Sync",
-    "Update policy successfully": "Update policy successfully"
+    "Repeated policy rules": "Repeated policy rules",
+    "Sync": "Sync"
   },
   "application": {
     "Always": "Always",
@@ -38,7 +36,6 @@
     "Enable signin session - Tooltip": "Enable signin session - Tooltip",
     "Enable signup": "サインアップを有効にする",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
-    "Failed to connect to server": "Failed to connect to server",
     "File uploaded successfully": "ファイルが正常にアップロードされました",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -128,7 +125,7 @@
     "Please input your username!": "ユーザー名を入力してください！",
     "Reset": "Reset",
     "Retrieve password": "パスワードの取得",
-    "Unknown forget type": "Unknown forget type",
+    "Unknown forget type: ": "Unknown forget type: ",
     "Verify": "確認する"
   },
   "general": {
@@ -167,6 +164,10 @@
     "Edit": "編集",
     "Email": "Eメールアドレス",
     "Email - Tooltip": "email",
+    "Failed to add": "Failed to add",
+    "Failed to connect to server": "Failed to connect to server",
+    "Failed to delete": "Failed to delete",
+    "Failed to save": "Failed to save",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Application icon",
     "First name": "First name",
@@ -237,6 +238,9 @@
     "Sorry, you do not have permission to access this page.": "申し訳ありませんが、このページにアクセスする権限がありません。",
     "State": "State",
     "State - Tooltip": "State - Tooltip",
+    "Successfully added": "Successfully added",
+    "Successfully deleted": "Successfully deleted",
+    "Successfully saved": "Successfully saved",
     "Swagger": "Swagger",
     "Sync": "Sync",
     "Syncers": "Syncers",

web/src/locales/ko/data.json

@@ -6,15 +6,13 @@
     "Sign Up": "Sign Up"
   },
   "adapter": {
-    "Add policy successfully": "Add policy successfully",
-    "Delete policy successfully": "Delete policy successfully",
     "Edit Adapter": "Edit Adapter",
+    "Failed to sync policies: ": "Failed to sync policies: ",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
-    "Repeated policy": "Repeated policy",
-    "Sync": "Sync",
-    "Update policy successfully": "Update policy successfully"
+    "Repeated policy rules": "Repeated policy rules",
+    "Sync": "Sync"
   },
   "application": {
     "Always": "Always",
@@ -38,7 +36,6 @@
     "Enable signin session - Tooltip": "Enable signin session - Tooltip",
     "Enable signup": "Enable signup",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
-    "Failed to connect to server": "Failed to connect to server",
     "File uploaded successfully": "File uploaded successfully",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -128,7 +125,7 @@
     "Please input your username!": "Please input your username!",
     "Reset": "Reset",
     "Retrieve password": "Retrieve password",
-    "Unknown forget type": "Unknown forget type",
+    "Unknown forget type: ": "Unknown forget type: ",
     "Verify": "Verify"
   },
   "general": {
@@ -167,6 +164,10 @@
     "Edit": "Edit",
     "Email": "Email",
     "Email - Tooltip": "email",
+    "Failed to add": "Failed to add",
+    "Failed to connect to server": "Failed to connect to server",
+    "Failed to delete": "Failed to delete",
+    "Failed to save": "Failed to save",
     "Favicon": "Favicon",
     "Favicon - Tooltip": "Application icon",
     "First name": "First name",
@@ -237,6 +238,9 @@
     "Sorry, you do not have permission to access this page.": "Sorry, you do not have permission to access this page.",
     "State": "State",
     "State - Tooltip": "State - Tooltip",
+    "Successfully added": "Successfully added",
+    "Successfully deleted": "Successfully deleted",
+    "Successfully saved": "Successfully saved",
     "Swagger": "Swagger",
     "Sync": "Sync",
     "Syncers": "Syncers",

web/src/locales/ru/data.json

@@ -6,15 +6,13 @@
     "Sign Up": "Регистрация"
   },
   "adapter": {
-    "Add policy successfully": "Add policy successfully",
-    "Delete policy successfully": "Delete policy successfully",
     "Edit Adapter": "Edit Adapter",
+    "Failed to sync policies: ": "Failed to sync policies: ",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
-    "Repeated policy": "Repeated policy",
-    "Sync": "Sync",
-    "Update policy successfully": "Update policy successfully"
+    "Repeated policy rules": "Repeated policy rules",
+    "Sync": "Sync"
   },
   "application": {
     "Always": "Always",
@@ -38,7 +36,6 @@
     "Enable signin session - Tooltip": "Включить сеанс входа - Подсказка",
     "Enable signup": "Включить регистрацию",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
-    "Failed to connect to server": "Failed to connect to server",
     "File uploaded successfully": "Файл успешно загружен",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -128,7 +125,7 @@
     "Please input your username!": "Пожалуйста, введите ваше имя пользователя!",
     "Reset": "Сбросить",
     "Retrieve password": "Получить пароль",
-    "Unknown forget type": "Неизвестный тип",
+    "Unknown forget type: ": "Unknown forget type: ",
     "Verify": "Подтвердить"
   },
   "general": {
@@ -167,6 +164,10 @@
     "Edit": "Редактирование",
     "Email": "Почта",
     "Email - Tooltip": "email",
+    "Failed to add": "Failed to add",
+    "Failed to connect to server": "Failed to connect to server",
+    "Failed to delete": "Failed to delete",
+    "Failed to save": "Failed to save",
     "Favicon": "Иконка",
     "Favicon - Tooltip": "Application icon",
     "First name": "Имя",
@@ -237,6 +238,9 @@
     "Sorry, you do not have permission to access this page.": "Извините, вы не имеете права доступа к этой странице.",
     "State": "State",
     "State - Tooltip": "State - Tooltip",
+    "Successfully added": "Successfully added",
+    "Successfully deleted": "Successfully deleted",
+    "Successfully saved": "Successfully saved",
     "Swagger": "Swagger",
     "Sync": "Sync",
     "Syncers": "Синхронизаторы",

web/src/locales/zh/data.json

@@ -6,15 +6,13 @@
     "Sign Up": "注册"
   },
   "adapter": {
-    "Add policy successfully": "添加策略成功",
-    "Delete policy successfully": "删除策略成功",
     "Edit Adapter": "编辑适配器",
+    "Failed to sync policies: ": "同步策略失败: ",
     "New Adapter": "添加适配器",
     "Policies": "策略",
     "Policies - Tooltip": "策略",
-    "Repeated policy": "策略重复",
-    "Sync": "同步",
-    "Update policy successfully": "更新策略成功"
+    "Repeated policy rules": "重复的策略",
+    "Sync": "同步"
   },
   "application": {
     "Always": "始终开启",
@@ -38,7 +36,6 @@
     "Enable signin session - Tooltip": "从应用登录Casdoor后，Casdoor是否保持会话",
     "Enable signup": "启用注册",
     "Enable signup - Tooltip": "是否允许用户注册",
-    "Failed to connect to server": "无法连接服务器",
     "File uploaded successfully": "文件上传成功",
     "Form CSS": "表单CSS",
     "Form CSS - Edit": "编辑表单CSS",
@@ -128,7 +125,7 @@
     "Please input your username!": "请输入您的用户名！",
     "Reset": "重置",
     "Retrieve password": "找回密码",
-    "Unknown forget type": "未知的忘记密码类型",
+    "Unknown forget type: ": "未知的忘记密码类型: ",
     "Verify": "验证"
   },
   "general": {
@@ -167,6 +164,10 @@
     "Edit": "编辑",
     "Email": "电子邮箱",
     "Email - Tooltip": "电子邮件：",
+    "Failed to add": "添加失败",
+    "Failed to connect to server": "连接服务器失败",
+    "Failed to delete": "删除失败",
+    "Failed to save": "保存失败",
     "Favicon": "网站图标",
     "Favicon - Tooltip": "网站的Favicon图标",
     "First name": "名字",
@@ -237,6 +238,9 @@
     "Sorry, you do not have permission to access this page.": "抱歉，您无权访问该页面",
     "State": "状态",
     "State - Tooltip": "状态",
+    "Successfully added": "添加成功",
+    "Successfully deleted": "删除成功",
+    "Successfully saved": "保存成功",
     "Swagger": "API文档",
     "Sync": "同步",
     "Syncers": "同步器",