fix: case insensitive country name and country abbreviation search in region selection (#1394)

* fix: fix bug in signup and reset phone and email

* delete useless addition

.github/workflows/sync.yml

@@ -29,6 +29,11 @@ jobs:
         crowdin_branch_name: l10n_branch
         config: './web/crowdin.yml'
 
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CROWDIN_PROJECT_ID: '463556'
+        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+
     - name: crowdin backend action
       uses: crowdin/github-action@1.4.8
       with:

controllers/account.go

@@ -161,7 +161,7 @@ func (c *ApiController) Signup() {
 		username = id
 	}
 
-	initScore, err := getInitScore()
+	initScore, err := getInitScore(organization)
 	if err != nil {
 		c.ResponseError(fmt.Errorf(c.T("account:Get init score failed, error: %w"), err).Error())
 		return

controllers/auth.go

@@ -412,7 +412,7 @@ func (c *ApiController) Login() {
 
 				properties := map[string]string{}
 				properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
-				initScore, err := getInitScore()
+				initScore, err := getInitScore(organization)
 				if err != nil {
 					c.ResponseError(fmt.Errorf(c.T("auth:Get init score failed, error: %w"), err).Error())
 					return

controllers/casbin_adapter.go

@@ -32,8 +32,8 @@ func (c *ApiController) GetCasbinAdapters() {
 	sortField := c.Input().Get("sortField")
 	sortOrder := c.Input().Get("sortOrder")
 	if limit == "" || page == "" {
-		c.Data["json"] = object.GetCasbinAdapters(owner)
-		c.ServeJSON()
+		adapters := object.GetCasbinAdapters(owner)
+		c.ResponseOk(adapters)
 	} else {
 		limit := util.ParseInt(limit)
 		paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetCasbinAdapterCount(owner, field, value)))
@@ -44,8 +44,8 @@ func (c *ApiController) GetCasbinAdapters() {
 
 func (c *ApiController) GetCasbinAdapter() {
 	id := c.Input().Get("id")
-	c.Data["json"] = object.GetCasbinAdapter(id)
-	c.ServeJSON()
+	adapter := object.GetCasbinAdapter(id)
+	c.ResponseOk(adapter)
 }
 
 func (c *ApiController) UpdateCasbinAdapter() {
@@ -96,8 +96,7 @@ func (c *ApiController) SyncPolicies() {
 		return
 	}
 
-	c.Data["json"] = policies
-	c.ServeJSON()
+	c.ResponseOk(policies)
 }
 
 func (c *ApiController) UpdatePolicy() {

controllers/util.go

@@ -84,7 +84,7 @@ func (c *ApiController) SetTokenErrorHttpStatus() {
 func (c *ApiController) RequireSignedIn() (string, bool) {
 	userId := c.GetSessionUsername()
 	if userId == "" {
-		c.ResponseError(c.T("util:Please login first"), "util:Please login first")
+		c.ResponseError(c.T("util:Please login first"), "Please login first")
 		return "", false
 	}
 	return userId, true
@@ -119,8 +119,12 @@ func (c *ApiController) RequireAdmin() (string, bool) {
 	return user.Owner, true
 }
 
-func getInitScore() (int, error) {
-	return strconv.Atoi(conf.GetConfigString("initScore"))
+func getInitScore(organization *object.Organization) (int, error) {
+	if organization != nil {
+		return organization.InitScore, nil
+	} else {
+		return strconv.Atoi(conf.GetConfigString("initScore"))
+	}
 }
 
 func (c *ApiController) GetProviderFromContext(category string) (*object.Provider, *object.User, bool) {

controllers/verification.go

@@ -47,6 +47,7 @@ func (c *ApiController) SendVerificationCode() {
 	checkKey := c.Ctx.Request.Form.Get("checkKey")
 	checkUser := c.Ctx.Request.Form.Get("checkUser")
 	applicationId := c.Ctx.Request.Form.Get("applicationId")
+	method := c.Ctx.Request.Form.Get("method")
 	remoteAddr := util.GetIPFromRequest(c.Ctx.Request)
 
 	if destType == "" {
@@ -119,7 +120,7 @@ func (c *ApiController) SendVerificationCode() {
 		}
 
 		userByEmail := object.GetUserByEmail(organization.Name, dest)
-		if userByEmail == nil {
+		if userByEmail == nil && method != "signup" && method != "reset" {
 			c.ResponseError(c.T("verification:the user does not exist, please sign up first"))
 			return
 		}
@@ -136,7 +137,7 @@ func (c *ApiController) SendVerificationCode() {
 		}
 
 		userByPhone := object.GetUserByPhone(organization.Name, dest)
-		if userByPhone == nil {
+		if userByPhone == nil && method != "signup" && method != "reset" {
 			c.ResponseError(c.T("verification:the user does not exist, please sign up first"))
 			return
 		}

object/init.go

@@ -59,6 +59,7 @@ func initBuiltInOrganization() bool {
 		DefaultAvatar: fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")),
 		Tags:          []string{},
 		Languages:     []string{"en", "zh", "es", "fr", "de", "ja", "ko", "ru"},
+		InitScore:     2000,
 		AccountItems: []*AccountItem{
 			{Name: "Organization", Visible: true, ViewRule: "Public", ModifyRule: "Admin"},
 			{Name: "ID", Visible: true, ViewRule: "Public", ModifyRule: "Immutable"},

object/organization.go

@@ -47,6 +47,7 @@ type Organization struct {
 	Tags               []string `xorm:"mediumtext" json:"tags"`
 	Languages          []string `xorm:"varchar(255)" json:"languages"`
 	MasterPassword     string   `xorm:"varchar(100)" json:"masterPassword"`
+	InitScore          int      `json:"initScore"`
 	EnableSoftDeletion bool     `json:"enableSoftDeletion"`
 	IsProfilePublic    bool     `json:"isProfilePublic"`
 

web/package.json

@@ -9,7 +9,7 @@
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
-    "antd": "5.0.3",
+    "antd": "5.0.5",
     "codemirror": "^5.61.1",
     "copy-to-clipboard": "^3.3.1",
     "core-js": "^3.25.0",

web/src/AdapterEditPage.js

@@ -48,12 +48,14 @@ class AdapterEditPage extends React.Component {
 
   getAdapter() {
     AdapterBackend.getAdapter(this.state.owner, this.state.adapterName)
-      .then((adapter) => {
-        this.setState({
-          adapter: adapter,
-        });
+      .then((res) => {
+        if (res.status === "ok") {
+          this.setState({
+            adapter: res.data,
+          });
 
-        this.getModels(adapter.owner);
+          this.getModels(this.adapter.owner);
+        }
       });
   }
 

web/src/AdapterListPage.js

@@ -87,7 +87,7 @@ class AdapterListPage extends BaseListPage {
         ...this.getColumnSearchProps("name"),
         render: (text, record, index) => {
           return (
-            <Link to={`/adapters/${text}`}>
+            <Link to={`/adapters/${record.organization}/${text}`}>
               {text}
             </Link>
           );

web/src/App.js

@@ -224,7 +224,7 @@ class App extends Component {
           this.setLanguage(account);
         } else {
           if (res.data !== "Please login first") {
-            Setting.showMessage("error", `Failed to sign in: ${res.msg}`);
+            Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
           }
         }
 
@@ -249,7 +249,7 @@ class App extends Component {
             account: null,
           });
 
-          Setting.showMessage("success", "Logged out successfully");
+          Setting.showMessage("success", i18next.t("application:Logged out successfully"));
           const redirectUri = res.data2;
           if (redirectUri !== null && redirectUri !== undefined && redirectUri !== "") {
             Setting.goToLink(redirectUri);

web/src/ApplicationListPage.js

@@ -197,9 +197,9 @@ class ApplicationListPage extends BaseListPage {
                     <List.Item>
                       <div style={{display: "inline"}}>
                         <Tooltip placement="topLeft" title="Edit">
-                          <Button style={{marginRight: "5px"}} icon={<EditOutlined />} size="small" onClick={() => Setting.goToLinkSoft(this, `/providers/${providerItem.name}`)} />
+                          <Button style={{marginRight: "5px"}} icon={<EditOutlined />} size="small" onClick={() => Setting.goToLinkSoft(this, `/providers/${record.organization}/${providerItem.name}`)} />
                         </Tooltip>
-                        <Link to={`/providers/${providerItem.name}`}>
+                        <Link to={`/providers/${record.organization}/${providerItem.name}`}>
                           {providerItem.name}
                         </Link>
                       </div>

web/src/OrganizationEditPage.js

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import React from "react";
-import {Button, Card, Col, Input, Row, Select, Switch} from "antd";
+import {Button, Card, Col, Input, InputNumber, Row, Select, Switch} from "antd";
 import * as OrganizationBackend from "./backend/OrganizationBackend";
 import * as ApplicationBackend from "./backend/ApplicationBackend";
 import * as LdapBackend from "./backend/LdapBackend";
@@ -86,7 +86,6 @@ class OrganizationEditPage extends React.Component {
 
   updateOrganizationField(key, value) {
     value = this.parseOrganizationField(key, value);
-
     const organization = this.state.organization;
     organization[key] = value;
     this.setState({
@@ -280,6 +279,16 @@ class OrganizationEditPage extends React.Component {
             </Select>
           </Col>
         </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
+            {Setting.getLabel(i18next.t("organization:InitScore"), i18next.t("organization:The user's initScore - Tooltip"))} :
+          </Col>
+          <Col span={4} >
+            <InputNumber value={this.state.organization.initScore} onChange={value => {
+              this.updateOrganizationField("initScore", value);
+            }} />
+          </Col>
+        </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
             {Setting.getLabel(i18next.t("organization:Soft deletion"), i18next.t("organization:Soft deletion - Tooltip"))} :

web/src/ResetModal.js

@@ -92,6 +92,7 @@ export const ResetModal = (props) => {
             <CountDownInput
               textBefore={i18next.t("code:Code You Received")}
               onChange={setCode}
+              method={"reset"}
               onButtonClickArgs={[dest, destType, Setting.getApplicationName(application)]}
               application={application}
             />

web/src/ResourceListPage.js

@@ -113,7 +113,7 @@ class ResourceListPage extends BaseListPage {
         ...this.getColumnSearchProps("application"),
         render: (text, record, index) => {
           return (
-            <Link to={`/applications/${text}`}>
+            <Link to={`/applications/${record.organization}/${text}`}>
               {text}
             </Link>
           );

web/src/SelectLanguageBox.js

@@ -14,7 +14,7 @@
 
 import React from "react";
 import * as Setting from "./Setting";
-import {Dropdown, Menu} from "antd";
+import {Dropdown} from "antd";
 import "./App.less";
 
 function flagIcon(country, alt) {
@@ -32,16 +32,7 @@ class SelectLanguageBox extends React.Component {
     };
   }
 
-  items = [
-    Setting.getItem("English", "en", flagIcon("US", "English")),
-    Setting.getItem("简体中文", "zh", flagIcon("CN", "简体中文")),
-    Setting.getItem("Español", "es", flagIcon("ES", "Español")),
-    Setting.getItem("Français", "fr", flagIcon("FR", "Français")),
-    Setting.getItem("Deutsch", "de", flagIcon("DE", "Deutsch")),
-    Setting.getItem("日本語", "ja", flagIcon("JP", "日本語")),
-    Setting.getItem("한국어", "ko", flagIcon("KR", "한국어")),
-    Setting.getItem("Русский", "ru", flagIcon("RU", "Русский")),
-  ];
+  items = Setting.Countries.map((country) => Setting.getItem(country.label, country.key, flagIcon(country.country, country.alt)));
 
   getOrganizationLanguages(languages) {
     const select = [];
@@ -53,15 +44,12 @@ class SelectLanguageBox extends React.Component {
 
   render() {
     const languageItems = this.getOrganizationLanguages(this.state.languages);
-    const menu = (
-      <Menu items={languageItems} onClick={(e) => {
-        Setting.setLanguage(e.key);
-      }}>
-      </Menu>
-    );
+    const onClick = (e) => {
+      Setting.setLanguage(e.key);
+    };
 
     return (
-      <Dropdown overlay={menu} >
+      <Dropdown menu={{items: languageItems, onClick}} >
         <div className="language-box" style={{display: languageItems.length === 0 ? "none" : null, ...this.props.style}} />
       </Dropdown>
     );

web/src/SelectRegionBox.js

@@ -42,12 +42,15 @@ class SelectRegionBox extends React.Component {
         placeholder="Please select country/region"
         onChange={(value => {this.onChange(value);})}
         filterOption={(input, option) =>
-          option.label.indexOf(input) >= 0
+          (option?.label ?? "").toLowerCase().includes(input.toLowerCase())
+        }
+        filterSort={(optionA, optionB) =>
+          (optionA?.label ?? "").toLowerCase().localeCompare((optionB?.label ?? "").toLowerCase())
         }
       >
         {
           Setting.CountryRegionData.map((item, index) => (
-            <Option key={index} value={item.code} label={item.code} >
+            <Option key={index} value={item.code} label={`${item.name} (${item.code})`} >
               <img src={`${Setting.StaticBaseUrl}/flag-icons/${item.code}.svg`} alt={item.name} height={20} style={{marginRight: 10}} />
               {`${item.name} (${item.code})`}
             </Option>

web/src/Setting.js

@@ -33,6 +33,16 @@ export const StaticBaseUrl = "https://cdn.casbin.org";
 // https://catamphetamine.gitlab.io/country-flag-icons/3x2/index.html
 export const CountryRegionData = getCountryRegionData();
 
+export const Countries = [{label: "English", key: "en", country: "US", alt: "English"},
+  {label: "简体中文", key: "zh", country: "CN", alt: "简体中文"},
+  {label: "Español", key: "es", country: "ES", alt: "Español"},
+  {label: "Français", key: "fr", country: "FR", alt: "Français"},
+  {label: "Deutsch", key: "de", country: "DE", alt: "Deutsch"},
+  {label: "日本語", key: "ja", country: "JP", alt: "日本語"},
+  {label: "한국어", key: "ko", country: "KR", alt: "한국어"},
+  {label: "Русский", key: "ru", country: "RU", alt: "Русский"},
+];
+
 export const OtherProviderInfo = {
   SMS: {
     "Aliyun SMS": {

web/src/UserListPage.js

@@ -62,6 +62,7 @@ class UserListPage extends BaseListPage {
       isAdmin: (owner === "built-in"),
       isGlobalAdmin: (owner === "built-in"),
       IsForbidden: false,
+      score: this.state.organization.initScore,
       isDeleted: false,
       properties: {},
       signupApplication: "app-built-in",

web/src/auth/ForgetPage.js

@@ -355,12 +355,14 @@ class ForgetPage extends React.Component {
             {this.state.verifyType === "email" ? (
               <CountDownInput
                 disabled={this.state.username === "" || this.state.verifyType === ""}
+                method={"forget"}
                 onButtonClickArgs={[this.state.email, "email", Setting.getApplicationName(this.state.application), this.state.name]}
                 application={application}
               />
             ) : (
               <CountDownInput
                 disabled={this.state.username === "" || this.state.verifyType === ""}
+                method={"forget"}
                 onButtonClickArgs={[this.state.phone, "phone", Setting.getApplicationName(this.state.application), this.state.name]}
                 application={application}
               />

web/src/auth/LoginPage.js

@@ -69,6 +69,12 @@ class LoginPage extends React.Component {
     }
   }
 
+  componentDidMount() {
+    Setting.Countries.forEach((country) => {
+      new Image().src = `${Setting.StaticBaseUrl}/flag-icons/${country.country}.svg`;
+    });
+  }
+
   componentDidUpdate(prevProps, prevState, snapshot) {
     if (this.state.application && !prevState.application) {
       const defaultCaptchaProviderItems = this.getDefaultCaptchaProviderItems(this.state.application);
@@ -293,7 +299,7 @@ class LoginPage extends React.Component {
             const responseType = values["type"];
 
             if (responseType === "login") {
-              Setting.showMessage("success", "Logged in successfully");
+              Setting.showMessage("success", i18next.t("application:Logged in successfully"));
 
               const link = Setting.getFromLink();
               Setting.goToLink(link);
@@ -719,6 +725,7 @@ class LoginPage extends React.Component {
           >
             <CountDownInput
               disabled={this.state.username?.length === 0 || !this.state.validEmailOrPhone}
+              method={"login"}
               onButtonClickArgs={[this.state.username, this.state.validEmail ? "email" : "phone", Setting.getApplicationName(application)]}
               application={application}
             />

web/src/auth/SignupPage.js

@@ -373,6 +373,7 @@ class SignupPage extends React.Component {
             >
               <CountDownInput
                 disabled={!this.state.validEmail}
+                method={"signup"}
                 onButtonClickArgs={[this.state.email, "email", Setting.getApplicationName(application)]}
                 application={application}
               />
@@ -426,6 +427,7 @@ class SignupPage extends React.Component {
           >
             <CountDownInput
               disabled={!this.state.validPhone}
+              method={"signup"}
               onButtonClickArgs={[this.state.phone, "phone", Setting.getApplicationName(application)]}
               application={application}
             />

web/src/backend/UserBackend.js

@@ -109,11 +109,12 @@ export function setPassword(userOwner, userName, oldPassword, newPassword) {
   }).then(res => res.json());
 }
 
-export function sendCode(checkType, checkId, checkKey, dest, type, applicationId, checkUser) {
+export function sendCode(checkType, checkId, checkKey, method, dest, type, applicationId, checkUser) {
   const formData = new FormData();
   formData.append("checkType", checkType);
   formData.append("checkId", checkId);
   formData.append("checkKey", checkKey);
+  formData.append("method", method);
   formData.append("dest", dest);
   formData.append("type", type);
   formData.append("applicationId", applicationId);

web/src/common/CountDownInput.js

@@ -22,7 +22,7 @@ import {CaptchaWidget} from "./CaptchaWidget";
 const {Search} = Input;
 
 export const CountDownInput = (props) => {
-  const {disabled, textBefore, onChange, onButtonClickArgs, application} = props;
+  const {disabled, textBefore, onChange, onButtonClickArgs, application, method} = props;
   const [visible, setVisible] = React.useState(false);
   const [key, setKey] = React.useState("");
   const [captchaImg, setCaptchaImg] = React.useState("");
@@ -53,7 +53,7 @@ export const CountDownInput = (props) => {
   const handleOk = () => {
     setVisible(false);
     setButtonLoading(true);
-    UserBackend.sendCode(checkType, checkId, key, ...onButtonClickArgs).then(res => {
+    UserBackend.sendCode(checkType, checkId, key, method, ...onButtonClickArgs).then(res => {
       setKey("");
       setButtonLoading(false);
       if (res) {
@@ -70,7 +70,7 @@ export const CountDownInput = (props) => {
   const loadCaptcha = () => {
     UserBackend.getCaptcha(application.owner, application.name, false).then(res => {
       if (res.type === "none") {
-        UserBackend.sendCode("none", "", "", ...onButtonClickArgs).then(res => {
+        UserBackend.sendCode("none", "", "", method, ...onButtonClickArgs).then(res => {
           if (res) {
             handleCountDown(60);
           }

web/src/common/OAuthWidget.js

@@ -164,7 +164,7 @@ class OAuthWidget extends React.Component {
           </span>
           {
             linkedValue === "" ? (
-              <a key={provider.displayName} href={Provider.getAuthUrl(application, provider, "link")}>
+              <a key={provider.displayName} href={user.id !== account.id ? null : Provider.getAuthUrl(application, provider, "link")}>
                 <Button style={{marginLeft: "20px", width: "80px"}} type="primary" disabled={user.id !== account.id}>{i18next.t("user:Link")}</Button>
               </a>
             ) : (

web/src/common/PoliciyTable.js

@@ -91,7 +91,8 @@ class PolicyTable extends React.Component {
     AdapterBackend.syncPolicies(this.props.owner, this.props.name)
       .then((res) => {
         if (res.status === "ok") {
-          this.setState({policyLists: res});
+          this.setState({policyLists: res.data});
+          Setting.showMessage("success", i18next.t("adapter:Sync policies successfully"));
         } else {
           Setting.showMessage("error", `${i18next.t("adapter:Failed to sync policies")}: ${res.msg}`);
         }
@@ -293,7 +294,7 @@ class PolicyTable extends React.Component {
 
   render() {
     return (<>
-      <Button type="primary" onClick={() => {this.synPolicies();}}>
+      <Button type="primary" disabled={this.state.editingIndex !== ""} onClick={() => {this.synPolicies();}}>
         {i18next.t("adapter:Sync")}
       </Button>
       {

web/src/locales/de/data.json

@@ -7,12 +7,13 @@
   },
   "adapter": {
     "Edit Adapter": "Edit Adapter",
-    "Failed to sync policies: ": "Failed to sync policies: ",
+    "Failed to sync policies": "Failed to sync policies",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
     "Repeated policy rules": "Repeated policy rules",
-    "Sync": "Sync"
+    "Sync": "Sync",
+    "Sync policies successfully": "Sync policies successfully"
   },
   "application": {
     "Always": "Always",
@@ -36,6 +37,7 @@
     "Enable signin session - Tooltip": "Aktiviere Anmeldesession - Tooltip",
     "Enable signup": "Anmeldung aktivieren",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
+    "Failed to sign in": "Failed to sign in",
     "File uploaded successfully": "Datei erfolgreich hochgeladen",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -45,6 +47,8 @@
     "Grant types": "Grant types",
     "Grant types - Tooltip": "Grant types - Tooltip",
     "Left": "Left",
+    "Logged in successfully": "Logged in successfully",
+    "Logged out successfully": "Logged out successfully",
     "New Application": "New Application",
     "None": "None",
     "Password ON": "Passwort AN",
@@ -326,6 +330,7 @@
     "Default avatar": "Standard Avatar",
     "Edit Organization": "Organisation bearbeiten",
     "Favicon": "Févicon",
+    "InitScore": "InitScore",
     "Is profile public": "Is profile public",
     "Is profile public - Tooltip": "Is profile public - Tooltip",
     "Modify rule": "Modify rule",
@@ -334,6 +339,7 @@
     "Soft deletion - Tooltip": "Weiche Löschung - Tooltip",
     "Tags": "Tags",
     "Tags - Tooltip": "Tags - Tooltip",
+    "The user's initScore - Tooltip": "The user's initScore - Tooltip",
     "View rule": "View rule",
     "Visible": "Visible",
     "Website URL": "Website-URL",

web/src/locales/en/data.json

@@ -7,12 +7,13 @@
   },
   "adapter": {
     "Edit Adapter": "Edit Adapter",
-    "Failed to sync policies: ": "Failed to sync policies: ",
+    "Failed to sync policies": "Failed to sync policies",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
     "Repeated policy rules": "Repeated policy rules",
-    "Sync": "Sync"
+    "Sync": "Sync",
+    "Sync policies successfully": "Sync policies successfully"
   },
   "application": {
     "Always": "Always",
@@ -36,6 +37,7 @@
     "Enable signin session - Tooltip": "Enable signin session - Tooltip",
     "Enable signup": "Enable signup",
     "Enable signup - Tooltip": "Enable signup - Tooltip",
+    "Failed to sign in": "Failed to sign in",
     "File uploaded successfully": "File uploaded successfully",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -45,6 +47,8 @@
     "Grant types": "Grant types",
     "Grant types - Tooltip": "Grant types - Tooltip",
     "Left": "Left",
+    "Logged in successfully": "Logged in successfully",
+    "Logged out successfully": "Logged out successfully",
     "New Application": "New Application",
     "None": "None",
     "Password ON": "Password ON",
@@ -326,6 +330,7 @@
     "Default avatar": "Default avatar",
     "Edit Organization": "Edit Organization",
     "Favicon": "Favicon",
+    "InitScore": "InitScore",
     "Is profile public": "Is profile public",
     "Is profile public - Tooltip": "Is profile public - Tooltip",
     "Modify rule": "Modify rule",
@@ -334,6 +339,7 @@
     "Soft deletion - Tooltip": "Soft deletion - Tooltip",
     "Tags": "Tags",
     "Tags - Tooltip": "Tags - Tooltip",
+    "The user's initScore - Tooltip": "The user's initScore - Tooltip",
     "View rule": "View rule",
     "Visible": "Visible",
     "Website URL": "Website URL",

web/src/locales/fr/data.json

@@ -7,12 +7,13 @@
   },
   "adapter": {
     "Edit Adapter": "Edit Adapter",
-    "Failed to sync policies: ": "Failed to sync policies: ",
+    "Failed to sync policies": "Failed to sync policies",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
     "Repeated policy rules": "Repeated policy rules",
-    "Sync": "Sync"
+    "Sync": "Sync",
+    "Sync policies successfully": "Sync policies successfully"
   },
   "application": {
     "Always": "Always",
@@ -36,6 +37,7 @@
     "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 sign in": "Failed to sign in",
     "File uploaded successfully": "Fichier téléchargé avec succès",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -45,6 +47,8 @@
     "Grant types": "Grant types",
     "Grant types - Tooltip": "Grant types - Tooltip",
     "Left": "Left",
+    "Logged in successfully": "Logged in successfully",
+    "Logged out successfully": "Logged out successfully",
     "New Application": "New Application",
     "None": "None",
     "Password ON": "Mot de passe activé",
@@ -326,6 +330,7 @@
     "Default avatar": "Avatar par défaut",
     "Edit Organization": "Modifier l'organisation",
     "Favicon": "Favicon",
+    "InitScore": "InitScore",
     "Is profile public": "Is profile public",
     "Is profile public - Tooltip": "Is profile public - Tooltip",
     "Modify rule": "Modify rule",
@@ -334,6 +339,7 @@
     "Soft deletion - Tooltip": "Suppression de soft - infobulle",
     "Tags": "Tags",
     "Tags - Tooltip": "Tags - Tooltip",
+    "The user's initScore - Tooltip": "The user's initScore - Tooltip",
     "View rule": "View rule",
     "Visible": "Visible",
     "Website URL": "URL du site web",

web/src/locales/ja/data.json

@@ -7,12 +7,13 @@
   },
   "adapter": {
     "Edit Adapter": "Edit Adapter",
-    "Failed to sync policies: ": "Failed to sync policies: ",
+    "Failed to sync policies": "Failed to sync policies",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
     "Repeated policy rules": "Repeated policy rules",
-    "Sync": "Sync"
+    "Sync": "Sync",
+    "Sync policies successfully": "Sync policies successfully"
   },
   "application": {
     "Always": "Always",
@@ -36,6 +37,7 @@
     "Enable signin session - Tooltip": "Enable signin session - Tooltip",
     "Enable signup": "サインアップを有効にする",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
+    "Failed to sign in": "Failed to sign in",
     "File uploaded successfully": "ファイルが正常にアップロードされました",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -45,6 +47,8 @@
     "Grant types": "Grant types",
     "Grant types - Tooltip": "Grant types - Tooltip",
     "Left": "Left",
+    "Logged in successfully": "Logged in successfully",
+    "Logged out successfully": "Logged out successfully",
     "New Application": "New Application",
     "None": "None",
     "Password ON": "パスワードON",
@@ -326,6 +330,7 @@
     "Default avatar": "デフォルトのアバター",
     "Edit Organization": "組織を編集",
     "Favicon": "ファビコン",
+    "InitScore": "InitScore",
     "Is profile public": "Is profile public",
     "Is profile public - Tooltip": "Is profile public - Tooltip",
     "Modify rule": "Modify rule",
@@ -334,6 +339,7 @@
     "Soft deletion - Tooltip": "ソフト削除 - ツールチップ",
     "Tags": "Tags",
     "Tags - Tooltip": "Tags - Tooltip",
+    "The user's initScore - Tooltip": "The user's initScore - Tooltip",
     "View rule": "View rule",
     "Visible": "Visible",
     "Website URL": "Website URL",

web/src/locales/ko/data.json

@@ -7,12 +7,13 @@
   },
   "adapter": {
     "Edit Adapter": "Edit Adapter",
-    "Failed to sync policies: ": "Failed to sync policies: ",
+    "Failed to sync policies": "Failed to sync policies",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
     "Repeated policy rules": "Repeated policy rules",
-    "Sync": "Sync"
+    "Sync": "Sync",
+    "Sync policies successfully": "Sync policies successfully"
   },
   "application": {
     "Always": "Always",
@@ -36,6 +37,7 @@
     "Enable signin session - Tooltip": "Enable signin session - Tooltip",
     "Enable signup": "Enable signup",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
+    "Failed to sign in": "Failed to sign in",
     "File uploaded successfully": "File uploaded successfully",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -45,6 +47,8 @@
     "Grant types": "Grant types",
     "Grant types - Tooltip": "Grant types - Tooltip",
     "Left": "Left",
+    "Logged in successfully": "Logged in successfully",
+    "Logged out successfully": "Logged out successfully",
     "New Application": "New Application",
     "None": "None",
     "Password ON": "Password ON",
@@ -326,6 +330,7 @@
     "Default avatar": "Default avatar",
     "Edit Organization": "Edit Organization",
     "Favicon": "Favicon",
+    "InitScore": "InitScore",
     "Is profile public": "Is profile public",
     "Is profile public - Tooltip": "Is profile public - Tooltip",
     "Modify rule": "Modify rule",
@@ -334,6 +339,7 @@
     "Soft deletion - Tooltip": "Soft deletion - Tooltip",
     "Tags": "Tags",
     "Tags - Tooltip": "Tags - Tooltip",
+    "The user's initScore - Tooltip": "The user's initScore - Tooltip",
     "View rule": "View rule",
     "Visible": "Visible",
     "Website URL": "Website URL",

web/src/locales/ru/data.json

@@ -7,12 +7,13 @@
   },
   "adapter": {
     "Edit Adapter": "Edit Adapter",
-    "Failed to sync policies: ": "Failed to sync policies: ",
+    "Failed to sync policies": "Failed to sync policies",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
     "Policies - Tooltip": "Policies - Tooltip",
     "Repeated policy rules": "Repeated policy rules",
-    "Sync": "Sync"
+    "Sync": "Sync",
+    "Sync policies successfully": "Sync policies successfully"
   },
   "application": {
     "Always": "Always",
@@ -36,6 +37,7 @@
     "Enable signin session - Tooltip": "Включить сеанс входа - Подсказка",
     "Enable signup": "Включить регистрацию",
     "Enable signup - Tooltip": "Whether to allow users to sign up",
+    "Failed to sign in": "Failed to sign in",
     "File uploaded successfully": "Файл успешно загружен",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
@@ -45,6 +47,8 @@
     "Grant types": "Виды грантов",
     "Grant types - Tooltip": "Виды грантов - Подсказка",
     "Left": "Left",
+    "Logged in successfully": "Logged in successfully",
+    "Logged out successfully": "Logged out successfully",
     "New Application": "Новое приложение",
     "None": "None",
     "Password ON": "Пароль ВКЛ",
@@ -326,6 +330,7 @@
     "Default avatar": "Аватар по умолчанию",
     "Edit Organization": "Изменить организацию",
     "Favicon": "Иконка",
+    "InitScore": "InitScore",
     "Is profile public": "Is profile public",
     "Is profile public - Tooltip": "Is profile public - Tooltip",
     "Modify rule": "Modify rule",
@@ -334,6 +339,7 @@
     "Soft deletion - Tooltip": "Мягкое удаление - Подсказка",
     "Tags": "Tags",
     "Tags - Tooltip": "Tags - Tooltip",
+    "The user's initScore - Tooltip": "The user's initScore - Tooltip",
     "View rule": "View rule",
     "Visible": "Visible",
     "Website URL": "URL сайта",

web/src/locales/zh/data.json

@@ -7,12 +7,13 @@
   },
   "adapter": {
     "Edit Adapter": "编辑适配器",
-    "Failed to sync policies: ": "同步策略失败: ",
+    "Failed to sync policies": "同步策略失败",
     "New Adapter": "添加适配器",
     "Policies": "策略",
     "Policies - Tooltip": "策略",
     "Repeated policy rules": "重复的策略",
-    "Sync": "同步"
+    "Sync": "同步",
+    "Sync policies successfully": "同步策略成功"
   },
   "application": {
     "Always": "始终开启",
@@ -36,6 +37,7 @@
     "Enable signin session - Tooltip": "从应用登录Casdoor后，Casdoor是否保持会话",
     "Enable signup": "启用注册",
     "Enable signup - Tooltip": "是否允许用户注册",
+    "Failed to sign in": "登录失败",
     "File uploaded successfully": "文件上传成功",
     "Form CSS": "表单CSS",
     "Form CSS - Edit": "编辑表单CSS",
@@ -45,6 +47,8 @@
     "Grant types": "OAuth授权类型",
     "Grant types - Tooltip": "选择允许哪些OAuth协议中的Grant types",
     "Left": "居左",
+    "Logged in successfully": "登录成功",
+    "Logged out successfully": "登出成功",
     "New Application": "添加应用",
     "None": "关闭",
     "Password ON": "开启密码",
@@ -326,6 +330,7 @@
     "Default avatar": "默认头像",
     "Edit Organization": "编辑组织",
     "Favicon": "图标",
+    "InitScore": "初始积分",
     "Is profile public": "用户个人页公开",
     "Is profile public - Tooltip": "关闭后，只有全局管理员或同组织用户才能访问用户主页",
     "Modify rule": "修改规则",
@@ -334,6 +339,7 @@
     "Soft deletion - Tooltip": "启用后，删除用户信息时不会在数据库彻底清除，只会标记为已删除状态",
     "Tags": "标签集合",
     "Tags - Tooltip": "可供用户选择的标签的集合",
+    "The user's initScore - Tooltip": "用户的初始积分",
     "View rule": "查看规则",
     "Visible": "是否可见",
     "Website URL": "网页地址",

web/yarn.lock

@@ -2096,6 +2096,13 @@
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
+"@rc-component/mini-decimal@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/mini-decimal/-/mini-decimal-1.0.1.tgz#e5dbc20a6a5b0e234d279bc71ce730ab865d3910"
+  integrity sha512-9N8nRk0oKj1qJzANKl+n9eNSMUGsZtjwNuDCiZ/KA+dt1fE3zq5x2XxclRcAbOIXnZcJ53ozP2Pa60gyELXagA==
+  dependencies:
+    "@babel/runtime" "^7.18.0"
+
 "@rc-component/portal@^1.0.0-6", "@rc-component/portal@^1.0.0-8", "@rc-component/portal@^1.0.0-9", "@rc-component/portal@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-1.0.3.tgz#3aa2c229a7a20ac2412d864e8977e6377973416e"
@@ -3134,10 +3141,10 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
   integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
 
-antd@5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-5.0.3.tgz#2cdaffe1afdb5c2f0f3325b2d06d508ec6ddf85a"
-  integrity sha512-Gqkba0earlR5H6gfT4nsyV3W9rL1Up1+clEXsa1+9Jem/geC2phBImpjWgVjqOjH3L5Oi8SHe0NeYBagDxwP5g==
+antd@5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-5.0.5.tgz#16f0ade8b2d2ea9f7bd47a8e0af81884dc504a7d"
+  integrity sha512-8jWUjZ65urNHZPg9/Ywa9V0PlNfqjhewKgSPF4nraN9X5v434lDJkRBQGN7meNixQ6aM2B/JhXPm9UaJ/tAQmA==
   dependencies:
     "@ant-design/colors" "^6.0.0"
     "@ant-design/cssinjs" "^1.0.0"
@@ -3159,7 +3166,7 @@ antd@5.0.3:
     rc-field-form "~1.27.0"
     rc-image "~5.12.0"
     rc-input "~0.1.4"
-    rc-input-number "~7.3.9"
+    rc-input-number "~7.4.0"
     rc-mentions "~1.13.1"
     rc-menu "~9.8.0"
     rc-motion "^2.6.1"
@@ -3175,15 +3182,15 @@ antd@5.0.3:
     rc-steps "~6.0.0-alpha.2"
     rc-switch "~4.0.0"
     rc-table "~7.26.0"
-    rc-tabs "~12.4.1"
+    rc-tabs "~12.4.2"
     rc-textarea "~0.4.5"
     rc-tooltip "~5.2.0"
     rc-tree "~5.7.0"
     rc-tree-select "~5.5.4"
     rc-trigger "^5.2.10"
     rc-upload "~4.3.0"
-    rc-util "^5.22.5"
-    scroll-into-view-if-needed "^2.2.25"
+    rc-util "^5.25.2"
+    scroll-into-view-if-needed "^3.0.3"
     shallowequal "^1.1.0"
 
 anymatch@^3.0.3, anymatch@~3.1.2:
@@ -4011,10 +4018,10 @@ compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-compute-scroll-into-view@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
-  integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
+compute-scroll-into-view@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-2.0.2.tgz#ac5cc71ca833884866e581a82d8558a6ed7ee877"
+  integrity sha512-W+4Iti92hktsTtNPNeRM1vE0JdqCBk5qIabRafpr5pGrQhQ+xzCv0NGnFzTCKmW4yGLm9Aovbw8YNxloe2z9tQ==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -8934,12 +8941,13 @@ rc-image@~5.12.0:
     rc-dialog "~9.0.0"
     rc-util "^5.0.6"
 
-rc-input-number@~7.3.9:
-  version "7.3.11"
-  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.3.11.tgz#c7089705a220e1a59ba974fabf89693e00dd2442"
-  integrity sha512-aMWPEjFeles6PQnMqP5eWpxzsvHm9rh1jQOWXExUEIxhX62Fyl/ptifLHOn17+waDG1T/YUb6flfJbvwRhHrbA==
+rc-input-number@~7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.4.0.tgz#b8b4ffa8bbc04198e79ce8b9611756d046d128ec"
+  integrity sha512-r/Oub/sPYbzqLNUOHnnc9sbCu78a81KX+RCbRwmpvB4W6nptUySbdWS5KHV4Hak5CAE1LAd+wWm5JjvZizG1FA==
   dependencies:
     "@babel/runtime" "^7.10.1"
+    "@rc-component/mini-decimal" "^1.0.1"
     classnames "^2.2.5"
     rc-util "^5.23.0"
 
@@ -9148,10 +9156,10 @@ rc-table@~7.26.0:
     rc-util "^5.22.5"
     shallowequal "^1.1.0"
 
-rc-tabs@~12.4.1:
-  version "12.4.1"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.4.1.tgz#a45aa7560ae4e2a91426e74a2e76566f5c8ec9cc"
-  integrity sha512-yViBZypldDnPffk3IPTarplF1RAv8VQDDnOt9sHDU7pjCnqE72csCU+7kjbLPtPpYniIMQJYyWxh/lsBUcagSA==
+rc-tabs@~12.4.2:
+  version "12.4.2"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.4.2.tgz#487a1b3f8d8cf0bfc121224013dab00d4a8e0532"
+  integrity sha512-FFlGwuTjQUznWzJtyhmHc6KAp5lRQFxKUv9Aj1UtsOYe2e7WGmuzcrd+/LQchuPe0VjhaZPdGkmFGcqGqNO6ow==
   dependencies:
     "@babel/runtime" "^7.11.2"
     classnames "2.x"
@@ -9269,6 +9277,15 @@ rc-util@^5.21.2, rc-util@^5.23.0:
     react-is "^16.12.0"
     shallowequal "^1.1.0"
 
+rc-util@^5.25.2:
+  version "5.25.2"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.25.2.tgz#09fd3ce88da7d2149427d51e40a84e3527f5a263"
+  integrity sha512-OyCO675K/rh4zG3e+LYaHw54WQFEYGV9ibkGawQxqCvf0G0PzUrLQjgZ6SfoHORdbEKN7eQMFn3hHQyA/P8Y5Q==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    react-is "^16.12.0"
+    shallowequal "^1.1.0"
+
 rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8:
   version "3.4.8"
   resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.8.tgz#c24c10c6940546b7e2a5e9809402c6716adfd26c"
@@ -9901,12 +9918,12 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.0.0"
 
-scroll-into-view-if-needed@^2.2.25:
-  version "2.2.29"
-  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz#551791a84b7e2287706511f8c68161e4990ab885"
-  integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==
+scroll-into-view-if-needed@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.0.3.tgz#57256bef78f3c3c288070d2aaa63cf547aa11e70"
+  integrity sha512-QoCH0lVw0tbA7Rl6sToH7e1tO3n95Oi6JgBgC8hEpNNZUC91MfasJ/4E1ZdbzGueNDZ+Y7ObfRaelKUgTyPbJA==
   dependencies:
-    compute-scroll-into-view "^1.0.17"
+    compute-scroll-into-view "^2.0.2"
 
 select-hose@^2.0.0:
   version "2.0.0"