From 90f8eba02da38f423bb9bc10cc3c9d288d8ffc5f Mon Sep 17 00:00:00 2001
From: Yaodong Yu <2814461814@qq.com>
Date: Mon, 13 Mar 2023 17:48:58 +0800
Subject: [PATCH] feat: can send Aliyun test SMS now (#1651)

---
 object/sms.go             |  2 +-
 web/src/auth/LoginPage.js | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/object/sms.go b/object/sms.go
index b8e2a5b3..5cb444fa 100644
--- a/object/sms.go
+++ b/object/sms.go
@@ -44,7 +44,7 @@ func SendSms(provider *Provider, content string, phoneNumbers ...string) error {
 
 	if provider.Type == sender.Aliyun {
 		for i, number := range phoneNumbers {
-			phoneNumbers[i] = strings.TrimPrefix(number, "+")
+			phoneNumbers[i] = strings.TrimPrefix(number, "+86")
 		}
 	}
 
diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
index b903e097..9fff2c10 100644
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -46,7 +46,6 @@ class LoginPage extends React.Component {
       username: null,
       validEmailOrPhone: false,
       validEmail: false,
-      validPhone: false,
       loginMethod: "password",
       enableCaptchaModal: false,
       openCaptchaModal: false,
@@ -427,16 +426,15 @@ class LoginPage extends React.Component {
                   {
                     validator: (_, value) => {
                       if (this.state.loginMethod === "verificationCode") {
-                        if (!Setting.isValidEmail(this.state.username) && !Setting.isValidPhone(this.state.username)) {
+                        if (!Setting.isValidEmail(value) && !Setting.isValidPhone(value)) {
                           this.setState({validEmailOrPhone: false});
                           return Promise.reject(i18next.t("login:The input is not valid Email or Phone!"));
                         }
 
-                        if (Setting.isValidPhone(this.state.username)) {
-                          this.setState({validPhone: true});
-                        }
-                        if (Setting.isValidEmail(this.state.username)) {
+                        if (Setting.isValidEmail(value)) {
                           this.setState({validEmail: true});
+                        } else {
+                          this.setState({validEmail: false});
                         }
                       }