Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed #91 Remove pem_cert_path config setting. #92

Merged
merged 1 commit into from
May 27, 2016
+18 −22
Merged

fixed #91 Remove pem_cert_path config setting. #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ android:

ios:
enabled: false
pem_cert_path: "cert.pem"
pem_key_path: "key.pem"
pem_path: "key.pem"
production: false

log:
Expand Down
10 changes: 4 additions & 6 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ type SectionAndroid struct {

// SectionIos is sub seciont of config.
type SectionIos struct {
Enabled bool `yaml:"enabled"`
PemCertPath string `yaml:"pem_cert_path"`
PemKeyPath string `yaml:"pem_key_path"`
Production bool `yaml:"production"`
Enabled bool `yaml:"enabled"`
PemPath string `yaml:"pem_path"`
Production bool `yaml:"production"`
}

// SectionLog is sub seciont of config.
Expand Down Expand Up @@ -106,8 +105,7 @@ func BuildDefaultPushConf() ConfYaml {

// iOS
conf.Ios.Enabled = false
conf.Ios.PemCertPath = "cert.pem"
conf.Ios.PemKeyPath = "key.pem"
conf.Ios.PemPath = "key.pem"
conf.Ios.Production = false

// log
Expand Down
3 changes: 1 addition & 2 deletions config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ android:

ios:
enabled: false
pem_cert_path: "cert.pem"
pem_key_path: "key.pem"
pem_path: "key.pem"
production: false

log:
Expand Down
2 changes: 1 addition & 1 deletion gorush.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func main() {
}

if *certificateKeyPath != "" {
gorush.PushConf.Ios.PemKeyPath = *certificateKeyPath
gorush.PushConf.Ios.PemPath = *certificateKeyPath
}

if *apiKey != "" {
Expand Down
4 changes: 2 additions & 2 deletions gorush/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func CheckPushConf() error {
}

if PushConf.Ios.Enabled {
if PushConf.Ios.PemKeyPath == "" {
if PushConf.Ios.PemPath == "" {
return errors.New("Missing iOS certificate path")
}
}
Expand All @@ -141,7 +141,7 @@ func InitAPNSClient() error {
if PushConf.Ios.Enabled {
var err error

CertificatePemIos, err = certificate.FromPemFile(PushConf.Ios.PemKeyPath, "")
CertificatePemIos, err = certificate.FromPemFile(PushConf.Ios.PemPath, "")

if err != nil {
LogError.Error("Cert Error:", err.Error())
Expand Down
18 changes: 9 additions & 9 deletions gorush/notification_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestMissingIOSCertificate(t *testing.T) {
PushConf = config.BuildDefaultPushConf()

PushConf.Ios.Enabled = true
PushConf.Ios.PemKeyPath = ""
PushConf.Ios.PemPath = ""

err := CheckPushConf()

Expand All @@ -53,7 +53,7 @@ func TestCorrectConf(t *testing.T) {
PushConf.Android.APIKey = "xxxxx"

PushConf.Ios.Enabled = true
PushConf.Ios.PemKeyPath = "xxxxx"
PushConf.Ios.PemPath = "xxxxx"

err := CheckPushConf()

Expand Down Expand Up @@ -221,7 +221,7 @@ func TestPushToIOS(t *testing.T) {
PushConf = config.BuildDefaultPushConf()

PushConf.Ios.Enabled = true
PushConf.Ios.PemKeyPath = "../certificate/certificate-valid.pem"
PushConf.Ios.PemPath = "../certificate/certificate-valid.pem"
InitAPNSClient()
InitAppStatus()

Expand Down Expand Up @@ -331,7 +331,7 @@ func TestSenMultipleNotifications(t *testing.T) {
InitWorkers(2, 2)

PushConf.Ios.Enabled = true
PushConf.Ios.PemKeyPath = "../certificate/certificate-valid.pem"
PushConf.Ios.PemPath = "../certificate/certificate-valid.pem"
InitAPNSClient()

PushConf.Android.Enabled = true
Expand Down Expand Up @@ -364,7 +364,7 @@ func TestDisabledAndroidNotifications(t *testing.T) {
PushConf = config.BuildDefaultPushConf()

PushConf.Ios.Enabled = true
PushConf.Ios.PemKeyPath = "../certificate/certificate-valid.pem"
PushConf.Ios.PemPath = "../certificate/certificate-valid.pem"
InitAPNSClient()

PushConf.Android.Enabled = false
Expand Down Expand Up @@ -397,7 +397,7 @@ func TestDisabledIosNotifications(t *testing.T) {
PushConf = config.BuildDefaultPushConf()

PushConf.Ios.Enabled = false
PushConf.Ios.PemKeyPath = "../certificate/certificate-valid.pem"
PushConf.Ios.PemPath = "../certificate/certificate-valid.pem"
InitAPNSClient()

PushConf.Android.Enabled = true
Expand Down Expand Up @@ -430,7 +430,7 @@ func TestMissingIosCertificate(t *testing.T) {
PushConf = config.BuildDefaultPushConf()

PushConf.Ios.Enabled = true
PushConf.Ios.PemKeyPath = "test"
PushConf.Ios.PemPath = "test"
err := InitAPNSClient()

assert.Error(t, err)
Expand All @@ -440,7 +440,7 @@ func TestAPNSClientDevHost(t *testing.T) {
PushConf = config.BuildDefaultPushConf()

PushConf.Ios.Enabled = true
PushConf.Ios.PemKeyPath = "../certificate/certificate-valid.pem"
PushConf.Ios.PemPath = "../certificate/certificate-valid.pem"
InitAPNSClient()

assert.Equal(t, apns2.HostDevelopment, ApnsClient.Host)
Expand All @@ -451,7 +451,7 @@ func TestAPNSClientProdHost(t *testing.T) {

PushConf.Ios.Enabled = true
PushConf.Ios.Production = true
PushConf.Ios.PemKeyPath = "../certificate/certificate-valid.pem"
PushConf.Ios.PemPath = "../certificate/certificate-valid.pem"
InitAPNSClient()

assert.Equal(t, apns2.HostProduction, ApnsClient.Host)
Expand Down