llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 20:50:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle error in go-sms-sender.

Browse Source
This commit is contained in:
Yang Luo
2021-09-05 10:48:03 +08:00
parent 88aa444ad1
commit 089f4ff480
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/service.go
View File

@ -104,7 +104,7 @@ func (c *ApiController) SendSms() {
return return
} }
client := sender.NewSmsClient( client, err := sender.NewSmsClient(
provider.Type, provider.Type,
provider.ClientId, provider.ClientId,
provider.ClientSecret, provider.ClientSecret,
@ -113,8 +113,8 @@ func (c *ApiController) SendSms() {
provider.TemplateCode, provider.TemplateCode,
provider.AppId, provider.AppId,
) )
if client == nil { if err != nil {
c.ResponseError("SMS client is null") c.ResponseError(err.Error())
return return
} }
@ -130,7 +130,11 @@ func (c *ApiController) SendSms() {
return return
} }
client.SendMessage(smsForm.Parameters, smsForm.Receivers...) err = client.SendMessage(smsForm.Parameters, smsForm.Receivers...)
if err != nil {
c.ResponseError(err.Error())
return
}
c.ResponseOk() c.ResponseOk()
} }

2
go.mod
View File

@ -9,7 +9,7 @@ require (
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
github.com/casbin/casbin/v2 v2.30.1 github.com/casbin/casbin/v2 v2.30.1
github.com/casbin/xorm-adapter/v2 v2.3.1 github.com/casbin/xorm-adapter/v2 v2.3.1
github.com/casdoor/go-sms-sender v0.0.3 github.com/casdoor/go-sms-sender v0.0.4
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df

4
go.sum
View File

@ -75,8 +75,8 @@ github.com/casbin/casbin/v2 v2.30.1 h1:P5HWadDL7olwUXNdcuKUBk+x75Y2eitFxYTcLNKeK
github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
github.com/casbin/xorm-adapter/v2 v2.3.1 h1:RVGsM6KYFP9s4OQJXrP/gv56Wmt5P40mzvcyXgv5xeg= github.com/casbin/xorm-adapter/v2 v2.3.1 h1:RVGsM6KYFP9s4OQJXrP/gv56Wmt5P40mzvcyXgv5xeg=
github.com/casbin/xorm-adapter/v2 v2.3.1/go.mod h1:GZ+nlIdasVFunQ71SlvkL/HcQQBvFncphDf+2Yl167c= github.com/casbin/xorm-adapter/v2 v2.3.1/go.mod h1:GZ+nlIdasVFunQ71SlvkL/HcQQBvFncphDf+2Yl167c=
github.com/casdoor/go-sms-sender v0.0.3 h1:17/dzAP/ZgSY4AORzcsR/48AKyBycQcHUGg00R9tnSI= github.com/casdoor/go-sms-sender v0.0.4 h1:UekC70YueeA5E2LrKJVQKCGntdTlYwal/7og4vao66U=
github.com/casdoor/go-sms-sender v0.0.3/go.mod h1:TMM/BsZQAa+7JVDXl2KqgxnzZgCjmHEX5MBN662mM5M= github.com/casdoor/go-sms-sender v0.0.4/go.mod h1:TMM/BsZQAa+7JVDXl2KqgxnzZgCjmHEX5MBN662mM5M=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

18
object/sms.go
View File

@ -14,16 +14,12 @@
package object package object
import ( import "github.com/casdoor/go-sms-sender"
"fmt"
"github.com/casdoor/go-sms-sender" func SendSms(provider *Provider, phone string, code string) error {
) client, err := go_sms_sender.NewSmsClient(provider.Type, provider.ClientId, provider.ClientSecret, provider.SignName, provider.RegionId, provider.TemplateCode, provider.AppId)
if err != nil {
func SendCodeToPhone(provider *Provider, phone, code string) error { return err
client := go_sms_sender.NewSmsClient(provider.Type, provider.ClientId, provider.ClientSecret, provider.SignName, provider.RegionId, provider.TemplateCode, provider.AppId)
if client == nil {
return fmt.Errorf("unsupported provider type: %s", provider.Type)
} }
param := map[string]string{} param := map[string]string{}
@ -33,6 +29,6 @@ func SendCodeToPhone(provider *Provider, phone, code string) error {
param["code"] = code param["code"] = code
} }
client.SendMessage(param, phone) err = client.SendMessage(param, phone)
return nil return err
} }

2
object/verification.go
View File

@ -68,7 +68,7 @@ func SendVerificationCodeToPhone(organization *Organization, user *User, provide
return err return err
} }
return SendCodeToPhone(provider, dest, code) return SendSms(provider, dest, code)
} }
func AddToVerificationRecord(user *User, provider *Provider, remoteAddr, recordType, dest, code string) error { func AddToVerificationRecord(user *User, provider *Provider, remoteAddr, recordType, dest, code string) error {