diff --git a/controllers/service.go b/controllers/service.go index b498cbac..d86b2d5e 100644 --- a/controllers/service.go +++ b/controllers/service.go @@ -96,6 +96,7 @@ func (c *ApiController) SendSms() { var smsForm struct { Content string `json:"content"` Receivers []string `json:"receivers"` + OrgId string `json:"organizationId"` // e.g. "admin/built-in" } err := json.Unmarshal(c.Ctx.Input.RequestBody, &smsForm) if err != nil { @@ -103,10 +104,13 @@ func (c *ApiController) SendSms() { return } + org := object.GetOrganization(smsForm.OrgId) var invalidReceivers []string - for _, receiver := range smsForm.Receivers { + for idx, receiver := range smsForm.Receivers { if !util.IsPhoneCnValid(receiver) { invalidReceivers = append(invalidReceivers, receiver) + } else { + smsForm.Receivers[idx] = fmt.Sprintf("+%s%s", org.PhonePrefix, receiver) } } diff --git a/controllers/verification.go b/controllers/verification.go index a79d87a6..62e52871 100644 --- a/controllers/verification.go +++ b/controllers/verification.go @@ -63,7 +63,7 @@ func (c *ApiController) SendVerificationCode() { user := c.getCurrentUser() organization := object.GetOrganization(orgId) application := object.GetApplicationByOrganizationName(organization.Name) - + sendResp := errors.New("Invalid dest type.") switch destType { case "email": @@ -90,12 +90,12 @@ func (c *ApiController) SendVerificationCode() { sendResp = object.SendVerificationCodeToPhone(organization, user, provider, remoteAddr, dest) } - status := "ok" if sendResp != nil { - status = "error" + c.Data["json"] = Response{Status: "error", Msg: sendResp.Error()} + } else { + c.Data["json"] = Response{Status: "ok"} } - c.Data["json"] = Response{Status: status, Msg: sendResp.Error()} c.ServeJSON() } diff --git a/object/verification.go b/object/verification.go index 4122e3ec..54c2ae43 100644 --- a/object/verification.go +++ b/object/verification.go @@ -68,7 +68,7 @@ func SendVerificationCodeToPhone(organization *Organization, user *User, provide return err } - return SendSms(provider, dest, code) + return SendSms(provider, code, dest) } func AddToVerificationRecord(user *User, provider *Provider, remoteAddr, recordType, dest, code string) error {