Add SMSFactor
This commit is contained in:
parent
85fe50f3b4
commit
65bcc8b451
|
@ -120,15 +120,16 @@ stat:
|
||||||
|
|
||||||
// ConfYaml is config structure.
|
// ConfYaml is config structure.
|
||||||
type ConfYaml struct {
|
type ConfYaml struct {
|
||||||
Core SectionCore `yaml:"core"`
|
Core SectionCore `yaml:"core"`
|
||||||
API SectionAPI `yaml:"api"`
|
API SectionAPI `yaml:"api"`
|
||||||
Android SectionAndroid `yaml:"android"`
|
Android SectionAndroid `yaml:"android"`
|
||||||
Huawei SectionHuawei `yaml:"huawei"`
|
Huawei SectionHuawei `yaml:"huawei"`
|
||||||
Ios SectionIos `yaml:"ios"`
|
Ios SectionIos `yaml:"ios"`
|
||||||
Queue SectionQueue `yaml:"queue"`
|
SMSFactor SectionSMSFactor `yaml:"smsfactor"`
|
||||||
Log SectionLog `yaml:"log"`
|
Queue SectionQueue `yaml:"queue"`
|
||||||
Stat SectionStat `yaml:"stat"`
|
Log SectionLog `yaml:"log"`
|
||||||
GRPC SectionGRPC `yaml:"grpc"`
|
Stat SectionStat `yaml:"stat"`
|
||||||
|
GRPC SectionGRPC `yaml:"grpc"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SectionCore is sub section of config.
|
// SectionCore is sub section of config.
|
||||||
|
@ -201,6 +202,13 @@ type SectionIos struct {
|
||||||
TeamID string `yaml:"team_id"`
|
TeamID string `yaml:"team_id"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SectionIos is sub section of config.
|
||||||
|
type SectionSMSFactor struct {
|
||||||
|
Enabled bool `yaml:"enabled"`
|
||||||
|
APIKey string `yaml:"apikey"`
|
||||||
|
MaxRetry int `yaml:"max_retry"`
|
||||||
|
}
|
||||||
|
|
||||||
// SectionLog is sub section of config.
|
// SectionLog is sub section of config.
|
||||||
type SectionLog struct {
|
type SectionLog struct {
|
||||||
Format string `yaml:"format"`
|
Format string `yaml:"format"`
|
||||||
|
@ -392,6 +400,11 @@ func LoadConf(confPath ...string) (*ConfYaml, error) {
|
||||||
conf.Ios.KeyID = viper.GetString("ios.key_id")
|
conf.Ios.KeyID = viper.GetString("ios.key_id")
|
||||||
conf.Ios.TeamID = viper.GetString("ios.team_id")
|
conf.Ios.TeamID = viper.GetString("ios.team_id")
|
||||||
|
|
||||||
|
// SMSFactor
|
||||||
|
conf.SMSFactor.Enabled = viper.GetBool("smsfactor.enabled")
|
||||||
|
conf.SMSFactor.APIKey = viper.GetString("smsfactor.apikey")
|
||||||
|
conf.SMSFactor.MaxRetry = viper.GetInt("smsfactor.max_retry")
|
||||||
|
|
||||||
// log
|
// log
|
||||||
conf.Log.Format = viper.GetString("log.format")
|
conf.Log.Format = viper.GetString("log.format")
|
||||||
conf.Log.AccessLog = viper.GetString("log.access_log")
|
conf.Log.AccessLog = viper.GetString("log.access_log")
|
||||||
|
|
|
@ -7,6 +7,10 @@ const (
|
||||||
PlatFormAndroid
|
PlatFormAndroid
|
||||||
// PlatFormHuawei constant is 3 for Huawei
|
// PlatFormHuawei constant is 3 for Huawei
|
||||||
PlatFormHuawei
|
PlatFormHuawei
|
||||||
|
// PlatformUnifiedPush constant is 4 for UnifiedPush
|
||||||
|
PlatformUnifiedPush
|
||||||
|
// PlatformSMSFactor constant is 5 for SMSFactor
|
||||||
|
PlatformSMSFactor
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
|
@ -21,6 +21,18 @@ const (
|
||||||
|
|
||||||
// HuaweiErrorKey is key name for huawei error count of storage
|
// HuaweiErrorKey is key name for huawei error count of storage
|
||||||
HuaweiErrorKey = "gorush-huawei-error-count"
|
HuaweiErrorKey = "gorush-huawei-error-count"
|
||||||
|
|
||||||
|
// UnifiedPushSuccessKey is key name for unifiedpush success count of storage
|
||||||
|
UnifiedPushSuccessKey = "gorush-unifiedpush-success-count"
|
||||||
|
|
||||||
|
// UnifiedPushErrorKey is key name for unifiedpush error count of storage
|
||||||
|
UnifiedPushErrorKey = "gorush-unifiedpush-error-count"
|
||||||
|
|
||||||
|
// SMSFactirSuccessKey is key name for smsfactor success count of storage
|
||||||
|
SMSFactorSuccessKey = "gorush-smsfactor-success-count"
|
||||||
|
|
||||||
|
// SMSfactorErrorKey is key name for smsfactor error count of storage
|
||||||
|
SMSFactorErrorKey = "gorush-smsfactor-error-count"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Storage interface
|
// Storage interface
|
||||||
|
|
|
@ -232,6 +232,12 @@ func CheckPushConf(cfg *config.ConfYaml) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if cfg.SMSFactor.Enabled {
|
||||||
|
if cfg.SMSFactor.APIKey == "" {
|
||||||
|
return errors.New("missing smsfactor api key")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -251,6 +257,8 @@ func SendNotification(req qcore.QueuedMessage, cfg *config.ConfYaml) (resp *Resp
|
||||||
resp, err = PushToAndroid(v, cfg)
|
resp, err = PushToAndroid(v, cfg)
|
||||||
case core.PlatFormHuawei:
|
case core.PlatFormHuawei:
|
||||||
resp, err = PushToHuawei(v, cfg)
|
resp, err = PushToHuawei(v, cfg)
|
||||||
|
case core.PlatformSMSFactor:
|
||||||
|
resp, err = PushToSMSFactor(v, cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.Core.FeedbackURL != "" {
|
if cfg.Core.FeedbackURL != "" {
|
||||||
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
package notify
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/appleboy/gorush/config"
|
||||||
|
"github.com/appleboy/gorush/logx"
|
||||||
|
)
|
||||||
|
|
||||||
|
// InitSMSFactorClient use for initialize SMSFactor Request.
|
||||||
|
func InitSMSFactorRequest(cfg *config.ConfYaml, token string, notification *PushNotification, recipient string) (*http.Request, error) {
|
||||||
|
|
||||||
|
req, _ := http.NewRequest("GET", "https://api.smsfactor.com/send", nil)
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
q := req.URL.Query()
|
||||||
|
q.Add("text", notification.Message)
|
||||||
|
q.Add("to", recipient)
|
||||||
|
q.Add("token", token)
|
||||||
|
req.URL.RawQuery = q.Encode()
|
||||||
|
|
||||||
|
return req, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func PushToSMSFactor(notification *PushNotification, cfg *config.ConfYaml) (resp *ResponsePush, err error) {
|
||||||
|
logx.LogAccess.Debug("Start push notification for SMSFactor")
|
||||||
|
|
||||||
|
// check message
|
||||||
|
err = CheckMessage(notification)
|
||||||
|
if err != nil {
|
||||||
|
logx.LogError.Error("request error: " + err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
resp = &ResponsePush{}
|
||||||
|
|
||||||
|
for _, recipient := range notification.Tokens {
|
||||||
|
var request *http.Request
|
||||||
|
|
||||||
|
if notification.APIKey != "" {
|
||||||
|
request, err = InitSMSFactorRequest(cfg, notification.APIKey, notification, recipient)
|
||||||
|
} else {
|
||||||
|
request, err = InitSMSFactorRequest(cfg, cfg.SMSFactor.APIKey, notification, recipient)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
logx.LogError.Error(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
client := &http.Client{}
|
||||||
|
_, err := client.Do(request)
|
||||||
|
if err != nil {
|
||||||
|
logx.LogError.Error(err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp, nil
|
||||||
|
}
|
Loading…
Reference in New Issue