feat: fix bug in signup and reset phone and email (#1396 )

* fix: fix bug in signup and reset phone and email * delete useless addition
fix: login page flag icon preload (#1393 )
2025-08-28 08:31:34 +08:00 · 2022-12-11 15:52:36 +08:00 · 2022-12-11 11:22:58 +08:00 · 2022-12-10 22:27:12 +08:00
23 changed files with 67 additions and 22 deletions
--- a/controllers/account.go
+++ b/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
--- a/controllers/auth.go
+++ b/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
--- a/controllers/util.go
+++ b/controllers/util.go
@@ -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) {
--- a/controllers/verification.go
+++ b/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
 		}
--- a/object/init.go
+++ b/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"},
--- a/object/organization.go
+++ b/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"`

--- a/web/src/OrganizationEditPage.js
+++ b/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"))} :
--- a/web/src/ResetModal.js
+++ b/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}
            />
--- a/web/src/SelectLanguageBox.js
+++ b/web/src/SelectLanguageBox.js
@@ -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 = [];
--- a/web/src/Setting.js
+++ b/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": {
--- a/web/src/UserListPage.js
+++ b/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",
--- a/web/src/auth/ForgetPage.js
+++ b/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}
              />
--- a/web/src/auth/LoginPage.js
+++ b/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);
@@ -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}
            />
--- a/web/src/auth/SignupPage.js
+++ b/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}
            />
--- a/web/src/backend/UserBackend.js
+++ b/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);
--- a/web/src/common/CountDownInput.js
+++ b/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);
          }
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@@ -330,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",
@@ -338,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",
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@@ -330,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",
@@ -338,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",
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@@ -330,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",
@@ -338,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",
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@@ -330,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",
@@ -338,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",
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@@ -330,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",
@@ -338,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",
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@@ -330,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",
@@ -338,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 сайта",
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@@ -330,6 +330,7 @@
    "Default avatar": "默认头像",
    "Edit Organization": "编辑组织",
    "Favicon": "图标",
+    "InitScore": "初始积分",
    "Is profile public": "用户个人页公开",
    "Is profile public - Tooltip": "关闭后，只有全局管理员或同组织用户才能访问用户主页",
    "Modify rule": "修改规则",
@@ -338,6 +339,7 @@
    "Soft deletion - Tooltip": "启用后，删除用户信息时不会在数据库彻底清除，只会标记为已删除状态",
    "Tags": "标签集合",
    "Tags - Tooltip": "可供用户选择的标签的集合",
+    "The user's initScore - Tooltip": "用户的初始积分",
    "View rule": "查看规则",
    "Visible": "是否可见",
    "Website URL": "网页地址",
Author	SHA1	Message	Date
Mr Forest	eca2527bc0	feat: fix bug in signup and reset phone and email (#1396 ) * fix: fix bug in signup and reset phone and email * delete useless addition	2022-12-11 15:52:36 +08:00
Chell	ef836acfe9	fix: login page flag icon preload (#1393 )	2022-12-11 11:22:58 +08:00
Yaodong Yu	a51f0d7c08	feat: init score in organization (#1388 ) * feat: init score in organization * Update OrganizationEditPage.js Co-authored-by: hsluoyz <hsluoyz@qq.com>	2022-12-10 22:27:12 +08:00